Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/12/18 14:23:45 (6 years ago)
Author:
ddorfmei
Message:

#2931:

  • upgraded Google OR-Tools to version 6.10
  • added TextValue and TextValueView to be able to display and edit a multiline string
  • added parameter to set solver specific parameters for supported solvers
  • added support for the Protocol Buffers representation of models (import/export)
  • added import of MPS models
  • added pause/stop functionality to CplexSolver and GlpkSolver
  • refactored wrapper (LinearSolver and related enums)
  • added new algorithm category Exact for LinearProgrammingAlgorithm
Location:
branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0
Files:
8 added
4 deleted
2 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/HeuristicLab.OrTools-6.10.0.csproj

    r16368 r16373  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.OrTools</RootNamespace>
    11     <AssemblyName>HeuristicLab.OrTools-6.9.0-pre</AssemblyName>
     11    <AssemblyName>HeuristicLab.OrTools-6.10.0</AssemblyName>
    1212    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>

  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Plugin.cs.frame

    r16288 r16373  
    2828namespace HeuristicLab.OrTools {
    2929
    30   [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.9.0.$WCREV$")]
    31   [PluginFile("HeuristicLab.OrTools-6.9.0-pre.dll", PluginFileType.Assembly)]
     30  [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.10.0.$WCREV$")]
     31  [PluginFile("HeuristicLab.OrTools-6.10.0.dll", PluginFileType.Assembly)]
    3232  [PluginFile("Google.OrTools.dll", PluginFileType.Assembly)]
    3333  [PluginFile("Google.OrTools-license.txt", PluginFileType.License)]
    … …  
    4040
    4141    ~HeuristicLabOrToolsPlugin() {
    42       OnUnload(); // HACK: remove once ticket #2961 is solved
     42      OnUnload(); // HACK: remove once ticket #2961 is resolved
    4343    }
    4444
    … …  
    4646      base.OnUnload();
    4747
    48       var thisClass = typeof(HeuristicLabOrToolsPlugin);
    49       var dir = new FileInfo(thisClass.Assembly.Location).Directory;
    50       if (dir == null)
     48      var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
     49      if (dllDir == null)
    5150        return;
    5251
    53       var nativeDlls = thisClass.GetCustomAttributes(typeof(PluginFileAttribute), true)
     52      var nativeDlls = GetType().GetCustomAttributes(typeof(PluginFileAttribute), true)
    5453        .Cast<PluginFileAttribute>()
    5554        .Where(pf => pf.FileType == PluginFileType.NativeDll)
    5655        .Select(pf => pf.FileName);
    5756
    58       foreach (var nativeDll in dir.EnumerateFiles().Where(f => nativeDlls.Contains(f.Name))) {
     57      foreach (var nativeDll in dllDir.EnumerateFiles().Where(f => nativeDlls.Contains(f.Name))) {
    5958        var handle = LoadLibrary(nativeDll.FullName);
    6059        if (handle == IntPtr.Zero)

  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Properties/AssemblyInfo.cs.frame

    r16070 r16373  
    5353// by using the '*' as shown below:
    5454// [assembly: AssemblyVersion("1.0.*")]
    55 [assembly: AssemblyVersion("6.8.0.0")]
    56 [assembly: AssemblyFileVersion("6.8.0.$WCREV$")]
     55[assembly: AssemblyVersion("6.10.0.0")]
     56[assembly: AssemblyFileVersion("6.10.0.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.