Changeset 18240 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

03/23/22 13:10:34 (3 years ago)

Author:

pfleck

Message:

#3040 smaller fixes and some code cleanup

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToTensorConverter.cs (modified) (6 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToTensorConverter.cs

@@ -58 +58 @@
 
         inputFeatures = converter.inputFeatures;
-        target = InputFeatureToTensor(problemData.TargetVariable, problemData, rows);
+        target = tf.reshape(InputFeatureToTensor(problemData.TargetVariable, problemData, rows), new Shape(-1));
         variables = converter.variables;
 
@@ -201 +201 @@
       } else if (node.Symbol is StartSymbol) {
         if (addLinearScalingTerms) {
-          var alpha_arr = np.array(1.0f).reshape(new Shape(1, 1));
+          var alpha_arr = np.array((float)1.0).reshape(new Shape(1, 1));
           var alpha = tf.Variable(alpha_arr, name: "alpha", dtype: DataType);
-          var beta_arr = np.array(0.0f).reshape(new Shape(1, 1));
+          var beta_arr = np.array((float)0.0).reshape(new Shape(1, 1));
           var beta = tf.Variable(beta_arr, name: "beta", dtype: DataType);
           variables.Add(node, new[] { beta, alpha });
@@ -272 +272 @@
       if (node.Symbol is Division) {
         var terms = node.Subtrees.Select(EvaluateNode).ToList();
-        //if (terms.Count == 1) return 1.0f / terms[0];
-        if (terms.Count == 1) return 1.0 / terms[0];
+        if (terms.Count == 1) return (float)1.0 / terms[0];
         return terms.Aggregate((a, b) => a / b);
       }
@@ -285 +284 @@
         var x1 = EvaluateNode(node.GetSubtree(0));
         var x2 = EvaluateNode(node.GetSubtree(1));
-        return x1 / tf.pow(1.0f + x2 * x2, 0.5f);
+        return x1 / tf.pow((float)1.0 + x2 * x2, (float)0.5);
         //return x1 / tf.pow(1.0 + x2 * x2, 0.5);
       }
@@ -297 +296 @@
         return tf.pow(
           (float)Math.E,
-          //Math.E,
           EvaluateNode(node.GetSubtree(0)));
       }
@@ -313 +311 @@
       if (node.Symbol is Cube) {
         return tf.pow(
-          EvaluateNode(node.GetSubtree(0)), 3.0f);
-        //ConvertNode(node.GetSubtree(0)), 3.0);
+          EvaluateNode(node.GetSubtree(0)), (float)3.0);
       }
 
       if (node.Symbol is CubeRoot) {
         return tf.pow(
-          EvaluateNode(node.GetSubtree(0)), 1.0f / 3.0f);
-        //ConvertNode(node.GetSubtree(0)), 1.0 / 3.0);
+          EvaluateNode(node.GetSubtree(0)), (float)1.0 / (float)3.0);
         // TODO
         // f: x < 0 ? -Math.Pow(-x, 1.0 / 3) : Math.Pow(x, 1.0 / 3),