Changeset 15700 for branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexSolver.cs

Timestamp:

01/31/18 18:14:33 (6 years ago)

Author:

abeham

Message:

#1614:

• Changed performance measure to stopwatch instead of datetime for precision reasons

File:

• branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexSolver.cs (modified) (4 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexSolver.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +27 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using ILOG.CPLEX;
@@ -50 +48 @@
     }
 
-    [Storable]
-    private ValueParameter<DateTimeValue> lastUpdateTimeParameter;
-    public IValueParameter<DateTimeValue> LastUpdateTimeParameter {
-      get { return lastUpdateTimeParameter; }
-    }
-
     [StorableConstructor]
     protected CplexSolver(bool deserializing) : base(deserializing) { }
     protected CplexSolver(CplexSolver original, Cloner cloner)
     : base(original, cloner) {
-      lastUpdateTimeParameter = cloner.Clone(original.lastUpdateTimeParameter);
     }
     public CplexSolver() {
       Problem = new GQAP();
-      Parameters.Add(lastUpdateTimeParameter = new ValueParameter<DateTimeValue>("LastUpdateTime", "") { Hidden = true });
-      var qpc = new QualityPerClockAnalyzer();
-      qpc.LastUpdateTimeParameter.ActualName = LastUpdateTimeParameter.Name;
-      ((MultiAnalyzer)Analyzer).AddOperator(qpc);
     }
 
     protected override void Run(CancellationToken cancellationToken) {
+      base.Run(cancellationToken);
       var factory = new OplFactory();
       var cplex = factory.CreateCplex();
@@ -80 +68 @@
         opl.AddDataSource(dataSource);
         opl.Generate();
-        LastUpdateTimeParameter.Value = new DateTimeValue(DateTime.UtcNow);
         cplex.Solve();
         cplex.End();