Changeset 16561

Timestamp:

01/25/19 21:01:02 (6 years ago)

Author:

bburlacu

Message:

#2987: Store the population as a List, so it can be cleared when the algorithm is finished in order to save memory. Unversion generated files (Plugin.cs and AssemblyInfo.cs)

Location:

branches/2987_MOEAD_Algorithm/HeuristicLab.Algorithms.MOEAD/3.4

Files:

• . (modified) (1 prop)
• MOEADAlgorithmBase.cs (modified) (4 diffs)
• Plugin.cs (deleted)
• Properties (modified) (1 prop)
• Properties/AssemblyInfo.cs (deleted)

branches/2987_MOEAD_Algorithm/HeuristicLab.Algorithms.MOEAD/3.4

@@ +1 @@
+*.aps
+*.eto
+*.nuget.props
+*.nuget.targets
+*.user
+ClientBin
+GeneratedArtifacts
+Plugin.cs
 [Bb]in
-obj
 [Dd]ebug
 [Rr]elease
-*.user
-*.aps
-*.eto
-ClientBin
-GeneratedArtifacts
 _Pvt_Extensions
+obj
 project.lock.json
-*.nuget.props
-*.nuget.targets

@@ +1 @@
+*.aps
+*.eto
+*.nuget.props
+*.nuget.targets
+*.user
+ClientBin
+GeneratedArtifacts
+Plugin.cs
 [Bb]in
-obj
 [Dd]ebug
 [Rr]elease
-*.user
-*.aps
-*.eto
-ClientBin
-GeneratedArtifacts
 _Pvt_Extensions
+obj
 project.lock.json
-*.nuget.props
-*.nuget.targets

branches/2987_MOEAD_Algorithm/HeuristicLab.Algorithms.MOEAD/3.4/MOEADAlgorithmBase.cs

@@ -42 +42 @@
 
     [Storable]
-    protected IList<IMOEADSolution> population;
-
-    [Storable]
-    protected IList<IMOEADSolution> offspringPopulation;
-
-    [Storable]
-    protected IList<IMOEADSolution> jointPopulation;
+    protected List<IMOEADSolution> population;
+
+    [Storable]
+    protected List<IMOEADSolution> offspringPopulation;
+
+    [Storable]
+    protected List<IMOEADSolution> jointPopulation;
 
     [Storable]
@@ -233 +233 @@
 
       if (original.population != null) {
-        population = original.population.Select(cloner.Clone).ToArray();
+        population = original.population.Select(cloner.Clone).ToList();
       }
 
       if (original.offspringPopulation != null) {
-        offspringPopulation = original.offspringPopulation.Select(cloner.Clone).ToArray();
+        offspringPopulation = original.offspringPopulation.Select(cloner.Clone).ToList();
       }
 
       if (original.jointPopulation != null) {
-        jointPopulation = original.jointPopulation.Select(x => cloner.Clone(x)).ToArray();
+        jointPopulation = original.jointPopulation.Select(x => cloner.Clone(x)).ToList();
       }
 
@@ -263 +263 @@
       var dimensions = maximization.Length;
       var populationSize = PopulationSize.Value;
-      population = new MOEADSolution[populationSize];
+      population = new List<IMOEADSolution>(populationSize);
 
       var parentScope = executionContext.Scope;
@@ -283 +283 @@
           solution.Qualities[j] = maximization[j] ? 1 - qualities[j] : qualities[j];
         }
-        population[i] = solution;
+        population.Add(solution);
       }
     }

@@ +1 @@
+*.aps
+*.eto
+*.nuget.props
+*.nuget.targets
+*.user
+ClientBin
+GeneratedArtifacts
+Plugin.cs
 [Bb]in
-obj
 [Dd]ebug
 [Rr]elease
-*.user
-*.aps
-*.eto
-ClientBin
-GeneratedArtifacts
 _Pvt_Extensions
+obj
 project.lock.json
-*.nuget.props
-*.nuget.targets