Changeset 17930 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

04/09/21 12:44:50 (3 years ago)

Author:

pfleck

Message:

#3040 Reworked external dependencies and merged some libraries (ILmerge) to avoid versions conflicts occuring on Hive.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (3 diffs)
• SingleObjective/Evaluators/NonlinearLeastSquaresVectorConstantOptimizationEvaluator.cs (modified) (3 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -110 +110 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="DiffSharp, Version=0.7.7.0, Culture=neutral, processorArchitecture=AMD64">
+    <Reference Include="DiffSharp.Merged, Version=0.8.4.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\DiffSharp.dll</HintPath>
+      <HintPath>..\..\bin\DiffSharp.Merged.dll</HintPath>
     </Reference>
     <Reference Include="MathNet.Numerics">
@@ -118 +118 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="netstandard" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -132 +133 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="TensorFlow.NET.Signed">
-      <HintPath>..\..\bin\TensorFlow.NET.Signed.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="TensorFlow.NET.Merged, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\TensorFlow.NET.Merged.dll</HintPath>
     </Reference>
   </ItemGroup>

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NonlinearLeastSquaresVectorConstantOptimizationEvaluator.cs

@@ -117 +117 @@
       alglib.ndimensional_func alglib_func = (double[] x, ref double func, object o) => {
         var vars = new DV(x);
-        func = loss(vars);
+        func = (double)loss(vars);
         var cnt = (EvaluationsCounter)o;
         cnt.FunctionEvaluations++;
@@ -123 +123 @@
       alglib.ndimensional_grad alglib_grad = (double[] x, ref double func, double[] grad, object o) => {
         var vars = new DV(x);
-        func = loss(vars);
-        Array.Copy(lossGrad(vars), grad, x.Length);
+        func = (double)loss(vars);
+        Array.Copy((double[])lossGrad(vars), grad, x.Length);
         var cnt = (EvaluationsCounter)o;
         cnt.GradientEvaluations++;
@@ -130 +130 @@
       alglib.ndimensional_hess alglib_hess = (double[] x, ref double func, double[] grad, double[,] hess, object o) => {
         var vars = new DV(x);
-        func = loss(vars);
-        Array.Copy(lossGrad(vars), grad, x.Length);
-        Array.Copy(lossHess(vars), hess, x.Length * x.Length);
+        func = (double)loss(vars);
+        Array.Copy((double[])lossGrad(vars), grad, x.Length);
+        Array.Copy((double[,])lossHess(vars), hess, x.Length * x.Length);
         var cnt = (EvaluationsCounter)o;
         cnt.HessianEvaluations++;