Changeset 15311 for branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental

Timestamp:

08/07/17 10:50:31 (7 years ago)

Author:

gkronber

Message:

#2789 exploration of alglib solver for non-linear optimization with non-linear constraints

Location:

branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental

Files:

• HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj (modified) (3 diffs)
• NonlinearRegression.cs (added)
• Plugin.cs.frame (modified) (2 diffs)
• SymbolicRegressionConstantOptimizationEvaluator.cs (added)
• TreeToAutoDiffTermConverter.cs (added)
• alglibnet2.dll (added)
• csharp (added)
• csharp/gpl2.txt (added)
• csharp/gpl3.txt (added)
• csharp/manual.csharp.html (added)
• csharp/src (added)
• csharp/src/alglib_info.cs (added)
• csharp/src/alglibinternal.cs (added)
• csharp/src/alglibmisc.cs (added)
• csharp/src/ap.cs (added)
• csharp/src/dataanalysis.cs (added)
• csharp/src/diffequations.cs (added)
• csharp/src/fasttransforms.cs (added)
• csharp/src/integration.cs (added)
• csharp/src/interpolation.cs (added)
• csharp/src/linalg.cs (added)
• csharp/src/optimization.cs (added)
• csharp/src/solvers.cs (added)
• csharp/src/specialfunctions.cs (added)
• csharp/src/statistics.cs (added)
• csharp/src/test_c.cs (added)
• csharp/src/test_c.exe (added)
• csharp/tests (added)
• csharp/tests/alglibnet2.dll (added)
• csharp/tests/test_c.cs (added)
• csharp/tests/test_i.cs (added)
• csharp/tests/test_i.exe (added)
• csharp/tests/test_x.cs (added)
• csharp/tests/test_x.exe (added)
• csharp/wrapper-ipython (added)
• csharp/wrapper-ipython/check.py (added)
• csharp/wrapper-ipython/manual.ipython.html (added)
• csharp/wrapper-ipython/xalglib.py (added)
• csharp/wrapper-vbnet (added)
• csharp/wrapper-vbnet/manual.vbnet.html (added)
• csharp/wrapper-vbnet/test_i.vb (added)
• csharp/wrapper-vbnet/xalglib.vb (added)

branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/HeuristicLab.Algorithms.DataAnalysis.Experimental.csproj

@@ -32 +32 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+    <Reference Include="alglibnet2, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
+      <HintPath>.\alglibnet2.dll</HintPath>
+    </Reference>
+    <Reference Include="AutoDiff-1.0, Version=1.0.0.14388, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\trunk\sources\bin\AutoDiff-1.0.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4">
@@ -97 +101 @@
     </Reference>
     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec" />
-    <Reference Include="MathNet.Numerics, Version=3.19.0.0, Culture=neutral, PublicKeyToken=cd8b63ad3d691a37, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\trunk\sources\bin\MathNet.Numerics.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MathNet.Numerics.Data.Matlab, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\trunk\sources\bin\MathNet.Numerics.Data.Matlab.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -117 +111 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GaussianProcessModelMKL.cs" />
-    <Compile Include="GaussianProcessRegressionModelCreatorMKL.cs" />
     <Compile Include="ForwardSelection.cs" />
     <Compile Include="LinearRegressionCombinations.cs" />
+    <Compile Include="NonlinearRegression.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HeuristicLab.ExtLibs.MathNetNumerics\HeuristicLab.ExtLibs.MathNetNumerics.csproj">
-      <Project>{fbd82eae-0d8a-41fa-a8fd-ec3d1574eed5}</Project>
-      <Name>HeuristicLab.ExtLibs.MathNetNumerics</Name>
-      <Private>False</Private>
-    </ProjectReference>
+    <Compile Include="SymbolicRegressionConstantOptimizationEvaluator.cs" />
+    <Compile Include="TreeToAutoDiffTermConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Plugin.cs.frame" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="alglibnet2.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/MathNetNumerics-Exploration-2789/HeuristicLab.Algorithms.DataAnalysis.Experimental/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Algorithms.DataAnalysis.Experimental", "", "3.4.0.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.DataAnalysis.Experimental.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.ALGLIB", "3.7")]
+  //[PluginDependency("HeuristicLab.ALGLIB", "3.7")]
   [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
-  [PluginDependency("HeuristicLab.ExtLibs.MathNetNumerics", "3.19")]
+  //[PluginDependency("HeuristicLab.ExtLibs.MathNetNumerics", "3.19")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]