Adding logical_and operator (SciSharp#338)

acifonelli · Oceania2018 · commit 3ff5988c1dae · 2019-08-03T07:49:10.000-05:00
Relative unit test in `OperationTest`.
diff --git a/src/TensorFlowNET.Core/APIs/tf.math.cs b/src/TensorFlowNET.Core/APIs/tf.math.cs
@@ -189,6 +189,9 @@ public static Tensor less_equal<Tx, Ty>(Tx x, Ty y, string name = null)
         public static Tensor log1p(Tensor x, string name = null)
             => gen_math_ops.log1p(x, name);
 
+        public static Tensor logical_and(Tensor x, Tensor y, string name = null)
+            => gen_math_ops.logical_and(x, y, name);
+
         /// <summary>
         /// Clips tensor values to a specified min and max.
         /// </summary>
diff --git a/src/TensorFlowNET.Core/Operations/gen_math_ops.cs b/src/TensorFlowNET.Core/Operations/gen_math_ops.cs
@@ -350,6 +350,13 @@ public static Tensor log1p(Tensor x, string name = null)
             return _op.outputs[0];
         }
 
+        public static Tensor logical_and(Tensor x, Tensor y, string name = null)
+        {
+            var _op = _op_def_lib._apply_op_helper("LogicalAnd", name, args: new { x, y });
+
+            return _op.outputs[0];
+        }
+
         public static Tensor squared_difference(Tensor x, Tensor y, string name = null)
         {
             var _op = _op_def_lib._apply_op_helper("SquaredDifference", name, args: new { x, y, name });
diff --git a/test/TensorFlowNET.UnitTest/OperationsTest.cs b/test/TensorFlowNET.UnitTest/OperationsTest.cs
@@ -130,6 +130,22 @@ public void cumSumTest()
             }
         }
 
+        [TestMethod]
+        public void logicalAndTest()
+        {
+            var a = tf.constant(new[] {1f, 2f, 3f, 4f, -4f, -3f, -2f, -1f});
+            var b = tf.less(a, 0f);
+            var c = tf.greater(a, 0f);
+            var d = tf.cast(tf.logical_and(b, c), tf.int32);
+            var check = np.array(new[] { 0, 0, 0, 0, 0, 0, 0, 0 });
+
+            using (var sess = tf.Session())
+            {
+                var o = sess.run(d);
+                Assert.IsTrue(o.array_equal(check));
+            }
+        }
+
         [TestMethod]
         public void addOpTests()
         {

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,13 @@ public static Tensor log1p(Tensor x, string name = null)`
`350`	`350`	`return _op.outputs[0];`
`351`	`351`	`}`
`352`	`352`
	`353`	`+ public static Tensor logical_and(Tensor x, Tensor y, string name = null)`
	`354`	`+ {`
	`355`	`+ var _op = _op_def_lib._apply_op_helper("LogicalAnd", name, args: new { x, y });`
	`356`	`+`
	`357`	`+ return _op.outputs[0];`
	`358`	`+ }`
	`359`	`+`
`353`	`360`	`public static Tensor squared_difference(Tensor x, Tensor y, string name = null)`
`354`	`361`	`{`
`355`	`362`	`var _op = _op_def_lib._apply_op_helper("SquaredDifference", name, args: new { x, y, name });`