Changeset 8954 for branches/SlaveShutdown/HeuristicLab.ExtLibs/HeuristicLab.AutoDiff/1.0/AutoDiff-1.0/ParametricCompiledTerm.cs

Timestamp:

11/27/12 20:09:33 (11 years ago)

Author:

ascheibe

Message:

#1986 merged trunk into SlaveShutdown branch

Location:

branches/SlaveShutdown

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.AutoDiff/1.0/AutoDiff-1.0/ParametricCompiledTerm.cs (modified) (2 diffs)

branches/SlaveShutdown/HeuristicLab.ExtLibs/HeuristicLab.AutoDiff/1.0/AutoDiff-1.0/ParametricCompiledTerm.cs

@@ -20 +20 @@
         public double Evaluate(double[] arg, double[] parameters)
         {
-            var combinedArg = arg.Concat(parameters).ToArray();
+            var combinedArg = new double[arg.Length + parameters.Length];
+            arg.CopyTo(combinedArg, 0);
+            parameters.CopyTo(combinedArg, arg.Length);
             return compiledTerm.Evaluate(combinedArg);
         }
@@ -26 +28 @@
         public Tuple<double[], double> Differentiate(double[] arg, double[] parameters)
         {
-            var combinedArg = arg.Concat(parameters).ToArray();
+            var combinedArg = new double[arg.Length + parameters.Length];
+            arg.CopyTo(combinedArg, 0);
+            parameters.CopyTo(combinedArg, arg.Length);
             var diffResult = compiledTerm.Differentiate(combinedArg);