Ignore:
Timestamp:
12/19/18 14:15:49 (3 months ago)
Author:
ddorfmei
Message:

#2931:

  • moved views to separate plugin HeuristicLab.MathematicalOptimization.Views
  • added button in LinearProgrammingProblemView to select the problem definition type
  • added views for problem definitions
  • added ExportFile parameter to LinearProgrammingAlgorithm
  • extended FileValue and FileValueView by the option to save a file
  • code cleanup
File:
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ExternalLinearSolver.cs

    r16404 r16405  
    2020#endregion
    2121
     22using Google.OrTools.LinearSolver;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2627
    27 namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base {
     28namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
    2829
    2930  [StorableClass]
    30   public class ExternalSolver : Solver, IExternalSolver {
     31  public class ExternalLinearSolver : LinearSolver, IExternalLinearSolver {
    3132    protected const string FileDialogFilter = "Dynamic-Link Library (*.dll)|*.dll|All Files (*.*)|*.*";
    3233
     
    3435    protected IFixedValueParameter<FileValue> libraryNameParam;
    3536
    36     public ExternalSolver() {
     37    public ExternalLinearSolver() {
    3738    }
    3839
    3940    [StorableConstructor]
    40     protected ExternalSolver(bool deserializing)
     41    protected ExternalLinearSolver(bool deserializing)
    4142      : base(deserializing) {
    4243    }
    4344
    44     protected ExternalSolver(ExternalSolver original, Cloner cloner)
     45    protected ExternalLinearSolver(ExternalLinearSolver original, Cloner cloner)
    4546      : base(original, cloner) {
    4647      libraryNameParam = cloner.Clone(original.libraryNameParam);
     
    5152      set => libraryNameParam.Value.Value = value;
    5253    }
     54
     55    protected override Solver CreateSolver(OptimizationProblemType optimizationProblemType,
     56      string libraryName = null) => base.CreateSolver(optimizationProblemType, LibraryName);
    5357  }
    5458}
Note: See TracChangeset for help on using the changeset viewer.