Changeset 16233 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools

Timestamp:

10/17/18 17:51:26 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• added all available parameters OR-Tools's linear_solver to LinearProgrammingAlgorithm
  • added necessary parameter enums
• moved solving logic to Solver
  • created IncrementalSolver, ExternalSolver, ExternalIncrementalSolver
  • added logic for solvers that can be stopped and resumed
• added SupportsStop property to BasicAlgorithm
• added quality per time chart for incremental solvers

Location:

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre

Files:

• HeuristicLab.OrTools-6.9.0-pre.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre.csproj

@@ -113 +113 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="GLPK-4.65-license.txt">
+    <Content Include="glpk-license.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -128 +128 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Google.OrTools.runtime.win-x64.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Google.OrTools_version.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Google.Protobuf.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="runtime.win-x64.Google.OrTools.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/Plugin.cs.frame

@@ -28 +28 @@
   [PluginFile("Google.OrTools.dll", PluginFileType.Assembly)]
   [PluginFile("Google.OrTools-license.txt", PluginFileType.License)]
-  [PluginFile("runtime.win-x64.Google.OrTools.dll", PluginFileType.NativeDll)]
+  [PluginFile("Google.OrTools.runtime.win-x64.dll", PluginFileType.NativeDll)]
   [PluginFile("Google.OrTools_version.txt", PluginFileType.Data)]
   [PluginFile("glpk_4_65.dll", PluginFileType.NativeDll)]
-  [PluginFile("GLPK-4.65-license.txt", PluginFileType.License)]
+  [PluginFile("glpk-license.txt", PluginFileType.License)]
   public class HeuristicLabOrToolsPlugin : PluginBase {
   }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.8.0.0")]
-[assembly: AssemblyFileVersion("6.8.0.16138")]
+[assembly: AssemblyFileVersion("6.8.0.16172")]