Changeset 17930 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToDiffSharpConverter.cs

Timestamp:

04/09/21 12:44:50 (3 years ago)

Author:

pfleck

Message:

#3040 Reworked external dependencies and merged some libraries (ILmerge) to avoid versions conflicts occuring on Hive.

File:

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

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

@@ -271 +271 @@
         var terms = node.Subtrees.Select(ConvertNode).ToList();
         if (terms.Count == 1) return FunctionApply(terms[0],
-            s => -s,
+            s => D.Neg(s),
             v => DV.Neg(v));
         return terms.Aggregate((a, b) =>
@@ -288 +288 @@
             (s1, v2) => s1 * v2,
             (v1, s2) => v1 * s2,
-            (v1, v2) => DV.op_DotMultiply(v1, v2)
+            (v1, v2) => DV.PointwiseMultiply(v1, v2)
           ));
       }
@@ -301 +301 @@
             (s1, v2) => s1 / v2,
             (v1, s2) => v1 / s2,
-            (v1, v2) => DV.op_DotDivide(v1, v2)
+            (v1, v2) => DV.PointwiseDivision(v1, v2)
           ));
       }
@@ -345 +345 @@
         return FunctionApply(ConvertNode(node.GetSubtree(0)),
           s => D.Sign(s) * D.Pow(D.Abs(s), 1.0 / 3.0),
-          v => DV.op_DotMultiply(DV.Sign(v), DV.Pow(DV.Abs(v), 1.0 / 3.0))
+          v => DV.PointwiseMultiply(DV.Sign(v), DV.Pow(DV.Abs(v), 1.0 / 3.0))
         );
       }