Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/21/18 09:50:12 (6 years ago)
Author:
ddorfmei
Message:

#2931:

  • created LinearProgrammingAlgorithm
    • created definitions for all LP/MIP solvers supported by OR-Tools
  • created LinearProgrammingProblem
    • created classes required for scripting: LinearProgrammingProblemDefinition, LinearProgrammingProblemDefinitionScript, CompiledLinearProgrammingProblemDefinition
    • created views: LinearProgrammingProblemView, LinearProgrammingProblemDefinitionScriptView
  • updated OR-Tools version in ExtLibs to 6.9
Location:
branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre
Files:
1 added
2 deleted
2 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • 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

    r16138 r16172  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.OrTools</RootNamespace>
    11     <AssemblyName>HeuristicLab.OrTools-6.8.0-pre</AssemblyName>
     11    <AssemblyName>HeuristicLab.OrTools-6.9.0-pre</AssemblyName>
    1212    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     
    128128      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    129129    </Content>
    130     <Content Include="Google.OrTools.import.dll">
    131       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    132     </Content>
    133     <Content Include="Google.OrTools.import.pdb">
    134       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    135     </Content>
    136130    <Content Include="Google.OrTools_version.txt">
    137131      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    138132    </Content>
    139133    <Content Include="Google.Protobuf.dll">
     134      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     135    </Content>
     136    <Content Include="runtime.win-x64.Google.OrTools.dll">
    140137      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    141138    </Content>
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/Plugin.cs.frame

    r16138 r16172  
    2424
    2525namespace HeuristicLab.OrTools {
    26   [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.8.0.$WCREV$")]
    27   [PluginFile("HeuristicLab.OrTools-6.8.0-pre.dll", PluginFileType.Assembly)]
     26  [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.9.0.$WCREV$")]
     27  [PluginFile("HeuristicLab.OrTools-6.9.0-pre.dll", PluginFileType.Assembly)]
    2828  [PluginFile("Google.OrTools.dll", PluginFileType.Assembly)]
    2929  [PluginFile("Google.OrTools-license.txt", PluginFileType.License)]
    30   [PluginFile("Google.OrTools.import.dll", PluginFileType.NativeDll)]
     30  [PluginFile("runtime.win-x64.Google.OrTools.dll", PluginFileType.NativeDll)]
    3131  [PluginFile("Google.OrTools_version.txt", PluginFileType.Data)]
    3232  [PluginFile("glpk_4_65.dll", PluginFileType.NativeDll)]
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.9.0-pre/HeuristicLab.OrTools-6.9.0-pre/Properties/AssemblyInfo.cs

    r16138 r16172  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("6.8.0.0")]
    56 [assembly: AssemblyFileVersion("6.8.0.16070")]
     56[assembly: AssemblyFileVersion("6.8.0.16138")]
Note: See TracChangeset for help on using the changeset viewer.