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

Timestamp:

02/13/19 17:29:49 (5 years ago)

Author:

gkronber

Message:

#2925: efficiency improvements

File:

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

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

@@ -17 +17 @@
     }
 
-    // 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 Vector Add(Vector b) {
+      var a = this;
+      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 Subtract(Vector a, Vector b) {
+    public Vector Subtract(Vector b) {
+      var a = this;
       if (b == Zero) return a;
       if (a == Zero) {
@@ -39 +41 @@
       }
       Trace.Assert(a.arr.Length == b.arr.Length);
-      var res = new double[a.arr.Length];
       for (int i = 0; i < a.arr.Length; i++)
-        res[i] = a.arr[i] - b.arr[i];
-      return new Vector(res);
+        a.arr[i] -= b.arr[i];
+      return a;
     }
 
-    public static Vector operator -(Vector a, Vector b) {
-      return Subtract(a, b);
-    }
-    public static Vector operator -(Vector v) {
-      return v.Scale(-1.0);
-    }
+    // public static Vector operator -(Vector a, Vector b) {
+    //   return Subtract(a, b);
+    // }
+    // public static Vector operator -(Vector v) {
+    //   return v.Scale(-1.0);
+    // }
 
-    public static Vector operator *(double s, Vector v) {
-      return v.Scale(s);
-    }
+    //public static Vector operator *(double s, Vector v) {
+    //  return v.Scale(s);
+    //}
 
     public Vector Scale(double 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;
+        arr[i] *= s;
       }
-      return new Vector(res);
-
+      return this;
     }
 
-    public static Vector operator *(Vector v, double s) {
-      return s * v;
-    }
+    // public static Vector operator *(Vector v, double s) {
+    //   return s * v;
+    // }
 
     public static Vector operator *(Vector u, Vector v) {
@@ -89 +88 @@
     }
 
-    public static Vector operator /(Vector v, double s) {
-      return v.Scale(1.0 / s);
+    // public static Vector operator /(Vector v, double s) {
+    //   return v.Scale(1.0 / s);
+    // }
+
+    public Vector Sin() {
+      for (int i = 0; i < arr.Length; i++) arr[i] = Math.Sin(arr[i]);
+      return this;
     }
-
-    public static Vector Sin(Vector s) {
-      var res = new double[s.arr.Length];
-      for (int i = 0; i < res.Length; i++) res[i] = Math.Sin(s.arr[i]);
-      return new Vector(res);
-    }
-    public static Vector Cos(Vector s) {
-      var res = new double[s.arr.Length];
-      for (int i = 0; i < res.Length; i++) res[i] = Math.Cos(s.arr[i]);
-      return new Vector(res);
+    public Vector Cos() {
+      for (int i = 0; i < arr.Length; i++) arr[i] = Math.Cos(arr[i]);
+      return this;
     }
 
@@ -137 +134 @@
     }
 
+    public void CopyTo(double[,] target, int rowIdx) {
+      if (target == null) return;
+      if (this == Zero) {
+        for (int j = 0; j < target.GetLength(1); j++) target[rowIdx, j] = 0.0;
+      } else {
+        for (int j = 0; j < target.GetLength(1); j++) target[rowIdx, j] = arr[j];
+      }
+    }
     /// <summary>
     /// Creates a new vector
@@ -165 +170 @@
       return new Vector(gArr);
     }
+
+    internal static Vector CreateFromMatrixRow(double[,] jac, int rowIdx) {
+      var arr = new double[jac.GetLength(1)];
+      for (int i = 0; i < arr.Length; i++) arr[i] = jac[rowIdx, i];
+      return new Vector(arr);
+    }
   }
 }