Changeset 6889 for branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Calculator.cs

Timestamp:

10/07/11 22:43:35 (13 years ago)

Author:

abeham

Message:

#1614

• put TestRandom class into HeuristicLab.Tests and removed the duplicates
• readded QAPLIB unit test which disappeared after the last merge
• readded deep cloning test which also disappeared

File:

• branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Calculator.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Calculator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -28 +29 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Globalization;
 
 namespace HeuristicLab.Optimization {
@@ -57 +57 @@
     protected Calculator(Calculator original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
-      tokens = original.tokens.ToList();
+      if (original.tokens != null)
+        tokens = original.tokens.ToList();
     }
     public IDeepCloneable Clone(Cloner cloner) {