Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/29/19 17:45:06 (5 years ago)
Author:
ddorfmei
Message:

#2931: solved the issues found during the review

File:
1 edited

Legend:

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

    r16405 r16582  
    2222using System;
    2323using System.Threading;
     24using Google.OrTools.LinearSolver;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    2930using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3031
    31 namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
     32namespace HeuristicLab.ExactOptimization.LinearProgramming {
    3233
    3334  [Item("SCIP", "SCIP (http://scip.zib.de/) must be installed and licenced.")]
     
    4344      SolverSpecificParameters =
    4445        "# for file format and parameters, see https://scip.zib.de/doc/html/PARAMETERS.php" + Environment.NewLine +
    45         "# example:" + Environment.NewLine +
    46         "# branching/random/seed = 10" + Environment.NewLine;
     46        "# examples:" + Environment.NewLine +
     47        "# branching/random/seed = 10" + Environment.NewLine +
     48        "# lp/initalgorithm = b # Barrier (root node of MIP)" + Environment.NewLine +
     49        "# lp/resolvealgorithm = b # Barrier (MIP)" + Environment.NewLine;
    4750    }
    4851
     
    5659    }
    5760
     61    protected override Solver.OptimizationProblemType OptimizationProblemType =>
     62      Solver.OptimizationProblemType.ScipMixedIntegerProgramming;
     63
    5864    protected override TimeSpan IntermediateTimeLimit => timeLimit += QualityUpdateInterval;
    5965
    60     protected override OptimizationProblemType OptimizationProblemType =>
    61           OptimizationProblemType.ScipMixedIntegerProgramming;
     66    public override IDeepCloneable Clone(Cloner cloner) => new ScipSolver(this, cloner);
    6267
    63     public override void Solve(ILinearProgrammingProblemDefinition problemDefintion, ref TimeSpan executionTime, ResultCollection results, CancellationToken cancellationToken) {
     68    public override void Solve(ILinearProblemDefinition problemDefintion, ResultCollection results, CancellationToken cancellationToken) {
    6469      timeLimit = TimeSpan.Zero;
    65       base.Solve(problemDefintion, ref executionTime, results, cancellationToken);
     70      base.Solve(problemDefintion, results, cancellationToken);
    6671    }
    6772  }
Note: See TracChangeset for help on using the changeset viewer.