Changeset 16600 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Vector.cs

Timestamp:

02/12/19 13:59:15 (5 years ago)

Author:

gkronber

Message:

#2925: made some simplifications (Vector) to aid debugging.

File:

• branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Vector.cs (modified) (5 diffs)

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Problems.DynamicalSystemsModelling/3.3/Vector.cs

@@ -16 +16 @@
     }
 
-    public static Vector AddTo(Vector a, Vector b) {
-      if (b == Zero) return a;
-      if (a == Zero) {
-        var vArr = new double[b.Length];
-        b.CopyTo(vArr);
-        return new Vector(vArr);
-      } else {
-        Trace.Assert(a.arr.Length == b.arr.Length);
-        for (int i = 0; i < a.arr.Length; i++)
-          a.arr[i] += b.arr[i];
-        return a;
-      }
-    }
+    // public static Vector AddTo(Vector a, Vector b) {
+    //   if (b == Zero) return a;
+    //   if (a == Zero) {
+    //     var vArr = new double[b.Length];
+    //     b.CopyTo(vArr);
+    //     return new Vector(vArr);
+    //   } else {
+    //     Trace.Assert(a.arr.Length == b.arr.Length);
+    //     for (int i = 0; i < a.arr.Length; i++)
+    //       a.arr[i] += b.arr[i];
+    //     return a;
+    //   }
+    // }
 
 
@@ -38 +38 @@
       }
       Trace.Assert(a.arr.Length == b.arr.Length);
+      var res = new double[a.arr.Length];
       for (int i = 0; i < a.arr.Length; i++)
-        a.arr[i] -= b.arr[i];
-      return a;
+        res[i] = a.arr[i] - b.arr[i];
+      return new Vector(res);
     }
 
     public static Vector operator -(Vector a, Vector b) {
-      if (b == Zero) return a;
-      if (a == Zero) return -b;
-      Trace.Assert(a.arr.Length == b.arr.Length);
-      var res = new double[a.arr.Length];
-      for (int i = 0; i < res.Length; i++)
-        res[i] = a.arr[i] - b.arr[i];
-      return new Vector(res);
+      return Subtract(a, b);
     }
     public static Vector operator -(Vector v) {
-      if (v == Zero) return Zero;
-      for (int i = 0; i < v.arr.Length; i++)
-        v.arr[i] = -v.arr[i];
-      return v;
+      return v.Scale(-1.0);
     }
 
     public static Vector operator *(double s, Vector v) {
-      if (v == Zero) return Zero;
-      if (s == 0.0) return Zero;
-      var res = new double[v.arr.Length];
-      for (int i = 0; i < res.Length; i++)
-        res[i] = s * v.arr[i];
-      return new Vector(res);
+      return v.Scale(s);
     }
 
     public Vector Scale(double s) {
-      if (this != Zero) {
-        for (int i = 0; i < arr.Length; i++) {
-          arr[i] *= s;
-        }
+      if (this == Zero) return Zero;
+
+      var res = new double[arr.Length];
+      for (int i = 0; i < arr.Length; i++) {
+        res[i] = arr[i] * s;
       }
+      return new Vector(res);
 
-      return this;
     }
 
@@ -81 +69 @@
       return s * v;
     }
+
     public static Vector operator *(Vector u, Vector v) {
       if (v == Zero) return Zero;
@@ -89 +78 @@
       return new Vector(res);
     }
+
     public static Vector operator /(double s, Vector v) {
       if (s == 0.0) return Zero;
@@ -94 +84 @@
       var res = new double[v.arr.Length];
       for (int i = 0; i < res.Length; i++)
-        res[i] = 1.0 / v.arr[i];
+        res[i] = s / v.arr[i];
       return new Vector(res);
     }
+
     public static Vector operator /(Vector v, double s) {
-      return v * 1.0 / s;
+      return v.Scale(1.0 / s);
     }