Changeset 16288 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs

Timestamp:

11/08/18 17:10:53 (5 years ago)

Author:

ddorfmei

Message:

#2931:

• added license information to all files
• added missing storable and cloning constructors
• fixed a bug that caused an exception when a Hive Slave tried to delete the files in the PluginTemp folder

File:

• branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs (modified) (4 diffs)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Threading;
 using Google.OrTools.LinearSolver;
@@ -38 +59 @@
 
     [Storable]
-    private readonly IConstrainedValueParameter<ISolver> solverParam;
+    private IConstrainedValueParameter<ISolver> solverParam;
 
     [Storable]
     private readonly IFixedValueParameter<TimeSpanValue> timeLimitParam;
+
+    public IConstrainedValueParameter<ISolver> SolverParameter {
+      get { return solverParam; }
+      set { solverParam = value; }
+    }
 
     public LinearProgrammingAlgorithm() {
@@ -77 +103 @@
 
     [StorableConstructor]
-    private LinearProgrammingAlgorithm(bool deserializing)
+    protected LinearProgrammingAlgorithm(bool deserializing)
       : base(deserializing) {
     }
 
-    private LinearProgrammingAlgorithm(LinearProgrammingAlgorithm original, Cloner cloner)
+    protected LinearProgrammingAlgorithm(LinearProgrammingAlgorithm original, Cloner cloner)
       : base(original, cloner) {
       solverParam = cloner.Clone(original.solverParam);
@@ -166 +192 @@
       Solver.Interrupt();
     }
+
     protected override void Initialize(CancellationToken cancellationToken) {
       base.Initialize(cancellationToken);
     }
+
     protected override void Run(CancellationToken cancellationToken) => Solver.Solve(this, cancellationToken);
   }