Changeset 17465

Timestamp:

03/02/20 16:35:29 (5 years ago)

Author:

pfleck

Message:

#3040 Simplified default vector grammar.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Grammars/TypeCoherentVectorExpressionGrammar.cs (modified) (1 diff)
• Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (6 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentVectorExpressionGrammar.cs

@@ -185 +185 @@
       AddAllowedChildSymbol(vectorroot, constant, 1);
       #endregion
+
+      #region default enabled/disabled
+      var disabledByDefault = new[] {
+        TrigonometricFunctionsName, ExponentialFunctionsName, PowerFunctionsName,
+        VectorTrigonometricFunctionsName, VectorExponentialFunctionsName, VectorPowerFunctionsName
+      };
+      foreach (var grp in Symbols.Where(sym => disabledByDefault.Contains(sym.Name)))
+        grp.Enabled = false;
+      #endregion
     }
 

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs

@@ -152 +152 @@
 
       public DoubleVector Vector { get; }
-      public bool IsVector => Vector != null;
-      //public bool IsVector => !(Vector.Count == 1 && double.IsNaN(Vector[0]));
+      public bool IsVector => !(Vector.Count == 1 && double.IsNaN(Vector[0]));
 
       public bool IsNaN => !IsScalar && !IsVector;
@@ -159 +158 @@
       public EvaluationResult(double scalar) {
         Scalar = scalar;
-        //Vector = NaNVector;
-        Vector = null;
+        Vector = NaNVector;
       }
       public EvaluationResult(DoubleVector vector) {
@@ -174 +172 @@
       }
 
+      private static readonly DoubleVector NaNVector = DoubleVector.Build.Dense(1, double.NaN);
       public static readonly EvaluationResult NaN = new EvaluationResult(double.NaN);
-      //private static readonly DoubleVector NaNVector = DoubleVector.Build.Dense(1, double.NaN);
     }
 
@@ -188 +186 @@
       if (lhs.IsVector && rhs.IsVector && vvFunc != null) return new EvaluationResult(vvFunc(lhs.Vector, rhs.Vector));
       return EvaluationResult.NaN;
-      //throw new NotSupportedException($"Unsupported combination of argument types: ({lhs}) / ({rhs})");
     }
 
@@ -197 +194 @@
       if (val.IsVector && vFunc != null) return new EvaluationResult(vFunc(val.Vector));
       return EvaluationResult.NaN;
-      //throw new NotSupportedException($"Unsupported argument type ({val})");
     }
     private static EvaluationResult AggregateApply(EvaluationResult val,
@@ -205 +201 @@
       if (val.IsVector && vFunc != null) return new EvaluationResult(vFunc(val.Vector));
       return EvaluationResult.NaN;
-      //throw new NotSupportedException($"Unsupported argument type ({val})");
     }