Ignore:
Timestamp:
12/19/18 14:15:49 (5 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 edited

Legend:

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

    r16373 r16405  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base;
     27using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    31 namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers {
     31namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
    3232
    3333  [Item("SCIP", "SCIP (http://scip.zib.de/) must be installed and licenced.")]
    3434  [StorableClass]
    35   public class ScipSolver : ExternalIncrementalSolver {
    36 
     35  public class ScipSolver : ExternalIncrementalLinearSolver {
    3736    private TimeSpan timeLimit = TimeSpan.Zero;
    3837
     
    4241      problemTypeParam.Value =
    4342        (EnumValue<ProblemType>)new EnumValue<ProblemType>(ProblemType.MixedIntegerProgramming).AsReadOnly();
    44       SolverSpecificParameters.Value =
     43      SolverSpecificParameters =
    4544        "# for file format and parameters, see https://scip.zib.de/doc/html/PARAMETERS.php" + Environment.NewLine +
    4645        "# example:" + Environment.NewLine +
     
    5756    }
    5857
     58    protected override TimeSpan IntermediateTimeLimit => timeLimit += QualityUpdateInterval;
     59
    5960    protected override OptimizationProblemType OptimizationProblemType =>
    60       OptimizationProblemType.ScipMixedIntegerProgramming;
    61     protected override TimeSpan TimeLimit => timeLimit += QualityUpdateInterval;
     61          OptimizationProblemType.ScipMixedIntegerProgramming;
    6262
    63     public override void Solve(LinearProgrammingAlgorithm algorithm, CancellationToken cancellationToken) {
     63    public override void Solve(ILinearProgrammingProblemDefinition problemDefintion, ref TimeSpan executionTime, ResultCollection results, CancellationToken cancellationToken) {
    6464      timeLimit = TimeSpan.Zero;
    65       base.Solve(algorithm, cancellationToken);
     65      base.Solve(problemDefintion, ref executionTime, results, cancellationToken);
    6666    }
    6767  }
Note: See TracChangeset for help on using the changeset viewer.