Changeset 16696

Timestamp:

03/19/19 13:38:33 (6 years ago)

Author:

gkronber

Message:

#2994 added a separate plugin with an algorithm for constrained non-linear regression

Location:

branches/2994-AutoDiffForIntervals

Files:

• HeuristicLab 3.3.sln (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4 (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/ConstrainedNonlinearRegression.cs (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression-3.4.csproj (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/HeuristicLab.snk (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/Plugin.cs.frame (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/Properties (added)
• HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression/3.4/Properties/AssemblyInfo.cs.frame (added)
• Tests/AutoDiffTest.cs (modified) (1 diff)
• Tests/Tests.csproj (modified) (5 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab 3.3.sln

@@ -464 +464 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{792B51DB-F5AC-4EED-B165-8E57057413B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression-3.4", "HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression\3.4\HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression-3.4.csproj", "{E4CED29F-964F-42AE-B400-AA00D0229CE5}"
 EndProject
 Global
@@ -2263 +2265 @@
     {792B51DB-F5AC-4EED-B165-8E57057413B4}.Release|x86.ActiveCfg = Release|Any CPU
     {792B51DB-F5AC-4EED-B165-8E57057413B4}.Release|x86.Build.0 = Release|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Debug|x64.Build.0 = Debug|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Debug|x86.Build.0 = Debug|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Release|x64.ActiveCfg = Release|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Release|x64.Build.0 = Release|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Release|x86.ActiveCfg = Release|Any CPU
+    {E4CED29F-964F-42AE-B400-AA00D0229CE5}.Release|x86.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/2994-AutoDiffForIntervals/Tests/AutoDiffTest.cs

@@ -9 +9 @@
 namespace Tests {
   [TestClass]
-  public class AutoDiffTest {
+  public class AutoDiffTestClass {
     [TestMethod]
-    public void Test() {
+    public void AutoDiffTest() {
       {
         // eval

branches/2994-AutoDiffForIntervals/Tests/Tests.csproj

@@ -40 +40 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
+      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
@@ -50 +53 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConstrainedNLRTest.cs" />
     <Compile Include="AutoDiffTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -57 +61 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression\3.4\HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression-3.4.csproj">
+      <Project>{e4ced29f-964f-42ae-b400-aa00d0229ce5}</Project>
+      <Name>HeuristicLab.Algorithms.DataAnalysis.ConstrainedNonlinearRegression-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
+      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
+      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
@@ -73 +85 @@
       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
       <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
@@ -80 +96 @@
       <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
+      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
+      <Name>HeuristicLab.Random-3.3</Name>
     </ProjectReference>
   </ItemGroup>