Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/07/19 15:30:17 (5 years ago)
Author:
abeham
Message:

#2931: merged to trunk

  • Fixed references in plugins
  • Fixed output path
  • Removed app.config from views plugin
  • Reverted changes to PathValue and FileValue and their respective views
Location:
trunk
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.ExactOptimization/3.3

    • Property svn:ignore

      •  

        old new  
        1212*.nuget.props
        1313*.nuget.targets
         14Plugin.cs

  • trunk/HeuristicLab.ExactOptimization/3.3/HeuristicLab.ExactOptimization-3.3.csproj

    r16736 r16910  
    4444  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4545    <DebugSymbols>true</DebugSymbols>
    46     <OutputPath>bin\x86\Debug\</OutputPath>
     46    <OutputPath>..\..\bin\</OutputPath>
    4747    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4848    <DebugType>full</DebugType>
    … …  
    6060  </PropertyGroup>
    6161  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    62     <OutputPath>bin\x86\Release\</OutputPath>
     62    <OutputPath>..\..\bin\</OutputPath>
    6363    <DefineConstants>TRACE</DefineConstants>
    6464    <Optimize>true</Optimize>
    … …  
    7777  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7878    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>bin\x64\Debug\</OutputPath>
     79    <OutputPath>..\..\bin\</OutputPath>
    8080    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8181    <DebugType>full</DebugType>
    … …  
    9393  </PropertyGroup>
    9494  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    95     <OutputPath>bin\x64\Release\</OutputPath>
     95    <OutputPath>..\..\bin\</OutputPath>
    9696    <DefineConstants>TRACE</DefineConstants>
    9797    <Optimize>true</Optimize>
    … …  
    114114      <SpecificVersion>False</SpecificVersion>
    115115      <HintPath>..\..\bin\Google.OrTools.dll</HintPath>
     116      <Private>False</Private>
    116117    </Reference>
    117118    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    118119      <SpecificVersion>False</SpecificVersion>
    119120      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    120     </Reference>
    121     <Reference Include="HeuristicLab.OrTools-7.0.0, Version=6.10.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    122       <SpecificVersion>False</SpecificVersion>
    123       <HintPath>..\..\bin\HeuristicLab.OrTools-7.0.0.dll</HintPath>
     121      <Private>False</Private>
    124122    </Reference>
    125123    <Reference Include="System" />
    … …  
    191189      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    192190      <Name>HeuristicLab.Analysis-3.3</Name>
     191      <Private>False</Private>
    193192    </ProjectReference>
    194193    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    195194      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    196195      <Name>HeuristicLab.Collections-3.3</Name>
     196      <Private>False</Private>
    197197    </ProjectReference>
    198198    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    199199      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    200200      <Name>HeuristicLab.Common.Resources-3.3</Name>
     201      <Private>False</Private>
    201202    </ProjectReference>
    202203    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    203204      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    204205      <Name>HeuristicLab.Common-3.3</Name>
     206      <Private>False</Private>
    205207    </ProjectReference>
    206208    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    207209      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    208210      <Name>HeuristicLab.Core-3.3</Name>
     211      <Private>False</Private>
    209212    </ProjectReference>
    210213    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    211214      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    212215      <Name>HeuristicLab.Data-3.3</Name>
     216      <Private>False</Private>
    213217    </ProjectReference>
    214218    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
    215219      <Project>{66D249C3-A01D-42A8-82A2-919BC8EC3D83}</Project>
    216220      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
     221      <Private>False</Private>
    217222    </ProjectReference>
    218223    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    219224      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    220225      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     226      <Private>False</Private>
    221227    </ProjectReference>
    222228    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    223229      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    224230      <Name>HeuristicLab.Optimization-3.3</Name>
     231      <Private>False</Private>
    225232    </ProjectReference>
    226233    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    227234      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    228235      <Name>HeuristicLab.Parameters-3.3</Name>
     236      <Private>False</Private>
    229237    </ProjectReference>
    230238    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    231239      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    232240      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     241      <Private>False</Private>
    233242    </ProjectReference>
    234243    <ProjectReference Include="..\..\HeuristicLab.Problems.Knapsack\3.3\HeuristicLab.Problems.Knapsack-3.3.csproj">
    235244      <Project>{E10F395F-C8A6-48AD-B470-9AA7A1F43809}</Project>
    236245      <Name>HeuristicLab.Problems.Knapsack-3.3</Name>
     246      <Private>False</Private>
    237247    </ProjectReference>
    238248    <ProjectReference Include="..\..\HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj">
    239249      <Project>{EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}</Project>
    240250      <Name>HeuristicLab.Problems.Programmable-3.3</Name>
     251      <Private>False</Private>
    241252    </ProjectReference>
    242253    <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
    243254      <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
    244255      <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
     256      <Private>False</Private>
    245257    </ProjectReference>
    246258    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
    247259      <Project>{21977CC3-1757-4B3B-87BD-FF817AAA900F}</Project>
    248260      <Name>HeuristicLab.Scripting-3.3</Name>
     261      <Private>False</Private>
    249262    </ProjectReference>
    250263  </ItemGroup>

  • trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalLinearSolver.cs

    r16736 r16910  
    8888    public override void Reset() {
    8989      base.Reset();
    90       stopwatch.Reset();
    9190      executionTime = TimeSpan.Zero;
    9291    }
    … …  
    114113          return;
    115114
    116         stopwatch.Start();
     115        stopwatch.Restart();
    117116        Solve(problemDefinition, results, IntermediateTimeLimit);
    118117        stopwatch.Stop();

  • trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/LinearSolver.cs

    r16736 r16910  
    4747    protected IFixedValueParameter<TextValue> solverSpecificParametersParam;
    4848
     49    public static string LogDirectory { get; }
     50
     51    static LinearSolver() {
     52      var solver = new Solver("", Solver.OptimizationProblemType.CbcMixedIntegerProgramming);
     53      LogDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
     54      Directory.CreateDirectory(LogDirectory);
     55      solver.InitLogging(Assembly.GetExecutingAssembly().Location, LogDirectory);
     56    }
     57
    4958    public LinearSolver() {
    5059      Parameters.Add(problemTypeParam =
    … …  
    165174
    166175        if (!solver.SetSolverSpecificParametersAsString(SolverSpecificParameters))
    167           throw new ArgumentException("Solver specific parameters could not be set.");
     176          throw new ArgumentException("Solver specific parameters could not be set. " +
     177            $"For details, see the log files in '{LogDirectory}'.");
    168178
    169179        resultStatus = (ResultStatus)solver.Solve(parameters);
    … …  
    225235        solver = new Solver(Name, optimizationProblemType, libraryName ?? string.Empty);
    226236      } catch {
    227         throw new InvalidOperationException($"Could not create {optimizationProblemType}.");
     237        solver = null;
    228238      }
    229239
    230240      if (solver == null)
    231         throw new InvalidOperationException($"Could not create {optimizationProblemType}.");
     241        throw new InvalidOperationException($"Could not create {optimizationProblemType}. " +
     242          $"For details, see the log files in '{LogDirectory}'.");
    232243
    233244      solver.SuppressOutput();

  • trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs

    r16736 r16910  
    3434
    3535    public GlopSolver() {
    36       problemTypeParam.Value = (EnumValue<ProblemType>)problemTypeParam.Value.AsReadOnly();
     36      problemTypeParam.Value = (EnumValue<ProblemType>)new EnumValue<ProblemType>(ProblemType.LinearProgramming).AsReadOnly();
    3737      SolverSpecificParameters =
    3838        "# for file format, see Protocol Buffers text format (https://developers.google.com/protocol-buffers/docs/overview#whynotxml)" + Environment.NewLine +

  • trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/FileBasedLinearProblemDefinition.cs

    r16736 r16910  
    2323using System.IO;
    2424using Google.OrTools.LinearSolver;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Common.Resources;
    … …  
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HEAL.Attic;
    3232
    3333namespace HeuristicLab.ExactOptimization.LinearProgramming {
    … …  
    5050        "Google OR-Tools Protocol Buffers Files (*.bin;*.prototxt)|*.bin;*.prototxt|" +
    5151        "All Files (*.*)|*.*";
    52       fileNameParam.Value.PathChanged += (o, e) => {
     52      fileNameParam.Value.StringValue.ValueChanged += (o, e) => {
    5353        if (File.Exists(FileName)) {
    5454          fileContent = File.ReadAllBytes(FileName);

  • trunk/HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/LinearProblem.cs

    r16736 r16910  
    2626using System.Reflection;
    2727using Google.OrTools.LinearSolver;
     28using HEAL.Attic;
    2829using HeuristicLab.Common;
    2930using HeuristicLab.Core;
    … …  
    3132using HeuristicLab.Optimization;
    3233using HeuristicLab.Parameters;
    33 using HEAL.Attic;
    3434
    3535namespace HeuristicLab.ExactOptimization.LinearProgramming {
    … …  
    4444    public LinearProblem() {
    4545      Parameters.Remove(Parameters["Operators"]);
    46       Parameters.Add(problemDefinitionParam = new ValueParameter<ILinearProblemDefinition>("Model",
    47         new ProgrammableLinearProblemDefinition(), false));
     46      Parameters.Add(problemDefinitionParam = new ValueParameter<ILinearProblemDefinition>("Model", "The linear programming problem",
     47        new ProgrammableLinearProblemDefinition()) { GetsCollected = false });
    4848    }
    4949
    … …  
    137137
    138138      if (!exportSuccessful)
    139         throw new InvalidDataException("Model could not be exported.");
     139        throw new InvalidOperationException($"Model could not be exported. " +
     140          $"For details, see the log files in '{LinearSolver.LogDirectory}'.");
    140141    }
    141142

  • trunk/HeuristicLab.ExactOptimization/3.3/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
Note: See TracChangeset for help on using the changeset viewer.