Changeset 17197 for branches

Timestamp:

08/09/19 18:20:34 (5 years ago)

Author:

gkronber

Message:

#2994: made an algorithm to experiment with NLOpt solvers

Location:

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions

Files:

• ConstrainedNLS.cs (added)
• ConstrainedNLSInternal.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Extensions.csproj (modified) (3 diffs)
• NLOpt.cs (modified) (1 diff)

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Extensions.csproj

@@ -68 +68 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConstrainedNLS.cs" />
+    <Compile Include="ConstrainedNLSInternal.cs" />
     <Compile Include="NLOpt.cs" />
     <Compile Include="NLOptEvaluator.cs" />
@@ -81 +83 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
@@ -126 +132 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/NLOpt.cs

@@ -169 +169 @@
 
     [DllImport("nlopt_x64.dll", CallingConvention = CallingConvention.Cdecl)]
-    public static extern nlopt_result nlopt_set_precond_min_objective(IntPtr nlopt_opt, nlopt_func f, nlopt_precond pre, IntPtr f_data);
-
-    [DllImport("nlopt_x64.dll", CallingConvention = CallingConvention.Cdecl)]
-    public static extern nlopt_result nlopt_set_precond_max_objective(IntPtr nlopt_opt, nlopt_func f, nlopt_precond pre, IntPtr f_data);
+    public static extern nlopt_result nlopt_set_precond_min_objective(IntPtr nlopt_opt, nlopt_func f, nlopt_precond pre, IntPtr f_data);  // only used by CCSAQ optimizer in NLOpt version 2.6.1
+
+    [DllImport("nlopt_x64.dll", CallingConvention = CallingConvention.Cdecl)]
+    public static extern nlopt_result nlopt_set_precond_max_objective(IntPtr nlopt_opt, nlopt_func f, nlopt_precond pre, IntPtr f_data);  // only used by CCSAQ optimizer in NLOpt version 2.6.1
 
     [DllImport("nlopt_x64.dll", CallingConvention = CallingConvention.Cdecl)]