Changeset 17303 for branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/AlgebraicSparseVector.cs

Timestamp:

10/03/19 12:30:19 (3 years ago)

Author:

gkronber

Message:

#2994 continued refactoring and extended unit tests. Interval calculation still fails for some edge cases (mainly for undefined behaviour). VectorEvaluator and VectorAutoDiffEvaluator produce the same results as the LinearInterpreter. TODO: check gradient calculation

File:

• branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/AlgebraicSparseVector.cs (modified) (1 diff)

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/AlgebraicSparseVector.cs

@@ -109 +109 @@
     }
 
-    public AlgebraicSparseVector<K, T> AssignMin(AlgebraicSparseVector<K, T> other) {
-      // assumes that keys without a matching key in other are zero and vice versa
-      foreach (var kvp in elems) if (!other.elems.ContainsKey(kvp.Key)) kvp.Value.AssignMin(kvp.Value.Zero); // min(v, 0)
-      foreach (var kvp in other.elems) {
-        if (elems.TryGetValue(kvp.Key, out T value))
-          value.AssignMin(kvp.Value);
-        else
-          elems.Add(kvp.Key, kvp.Value.Zero.AssignMin(kvp.Value));
-      }
-      return this;
-    }
-
-    public AlgebraicSparseVector<K, T> AssignMax(AlgebraicSparseVector<K, T> other) {
-      // assumes that keys without a matching key in other are zero and vice versa
-      foreach (var kvp in elems) if (!other.elems.ContainsKey(kvp.Key)) kvp.Value.AssignMax(kvp.Value.Zero); // max(v, 0)
-      foreach (var kvp in other.elems) {
-        if (elems.TryGetValue(kvp.Key, out T value))
-          value.AssignMax(kvp.Value);
-        else
-          elems.Add(kvp.Key, kvp.Value.Zero.AssignMax(kvp.Value));
-      }
-      return this;
-    }
-
-
     public AlgebraicSparseVector<K, T> Clone() {
       return new AlgebraicSparseVector<K, T>(this);