Changeset 17970 for branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Analysis

Timestamp:

04/30/21 12:18:19 (4 years ago)

Author:

gkronber

Message:

#3106 merged r17856:17969 from trunk to branch

Location:

branches/3106_AnalyticContinuedFractionsRegression

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/Statistics/Fitting/LogFitting.cs (modified) (2 diffs)

branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -105 +105 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
+    <Reference Include="ALGLIB-3.17.0, Version=3.17.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\ALGLIB-3.17.0.dll</HintPath>
       <Private>False</Private>
     </Reference>

branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Analysis/3.3/MultidimensionalScaling/MultidimensionalScaling.cs

@@ -72 +72 @@
       if (dimension != dissimilarities.Columns || coordinates.Rows != dimension) throw new ArgumentException("The number of coordinates and the number of rows and columns in the dissimilarities matrix do not match.");
 
-      double epsg = 1e-7;
-      double epsf = 0;
       double epsx = 0;
       int maxits = 0;
@@ -86 +84 @@
           try {
             alglib.minlmcreatevj(dimension - 1, c, out state);
-            alglib.minlmsetcond(state, epsg, epsf, epsx, maxits);
+            alglib.minlmsetcond(state, epsx, maxits);
             alglib.minlmoptimize(state, StressFitness, StressJacobian, null, new Info(coordinates, dissimilarities, i));
             alglib.minlmresults(state, out c, out rep);

branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Analysis/3.3/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Analysis", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Analysis-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
+  [PluginDependency("HeuristicLab.ALGLIB", "3.17.0")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.cs

@@ -41 +41 @@
     public void Calculate(double[] y, double[] x, out double p0) {
       if (y.Count() != x.Count()) {
-        throw new ArgumentException("The lenght of x and y needs do be equal. ");
+        throw new ArgumentException("The length of x and y needs do be equal. ");
       }
 
       double[] c = new double[] { 0.3 };
-      double epsf = 0;
       double epsx = 0.000001;
       int maxits = 0;
@@ -59 +58 @@
 
       alglib.lsfitcreatef(xx, y, c, diffstep, out state);
-      alglib.lsfitsetcond(state, epsf, epsx, maxits);
+      alglib.lsfitsetcond(state, epsx, maxits);
       alglib.lsfitfit(state, ExpFunc, null, null);
       alglib.lsfitresults(state, out info, out c, out rep);

branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Analysis/3.3/Statistics/Fitting/LogFitting.cs

@@ -45 +45 @@
 
       double[] c = new double[] { 0.3, 0.3 };
-      double epsf = 0;
       double epsx = 0.000001;
       int maxits = 0;
@@ -59 +58 @@
 
       alglib.lsfitcreatef(xx, y, c, diffstep, out state);
-      alglib.lsfitsetcond(state, epsf, epsx, maxits);
+      alglib.lsfitsetcond(state, epsx, maxits);
       alglib.lsfitfit(state, LogFunc, null, null);
       alglib.lsfitresults(state, out info, out c, out rep);