Changeset 10454 for branches/SimulationCore/HeuristicLab.SimulationCore.Samples/3.3/GameOfLifeSimulation.cs

Timestamp:

02/13/14 17:28:30 (10 years ago)

Author:

abeham

Message:

#1610: updated core, implemented card game sample

File:

• branches/SimulationCore/HeuristicLab.SimulationCore.Samples/3.3/GameOfLifeSimulation.cs (modified) (10 diffs)

branches/SimulationCore/HeuristicLab.SimulationCore.Samples/3.3/GameOfLifeSimulation.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Threading;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using System.Threading;
+using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 using HeuristicLab.SimulationCore.AgentBased;
-using HeuristicLab.Analysis;
 
 namespace HeuristicLab.SimulationCore.Samples {
@@ -38 +37 @@
   [Creatable("Simulations")]
   [StorableClass]
-  public sealed class GameOfLifeSimulation: AgentBasedSimulation {
+  public sealed class GameOfLifeSimulation : AgentBasedSimulation {
     public override Type ProblemType {
       get { return typeof(GameOfLifeScenario); }
@@ -48 +47 @@
       }
     }
-    
+
     public ValueParameter<IntValue> IterationsParameter {
       get { return (ValueParameter<IntValue>)Parameters["Iterations"]; }
     }
-    
-    public GameOfLifeSimulation() : base() {
+
+    public GameOfLifeSimulation()
+      : base() {
       Parameters.Add(new ValueParameter<IntValue>("Iterations", "The number of iterations.", new IntValue(100)));
 
@@ -72 +72 @@
     }
 
-    private GameOfLifeAgent GetAgent(int x, int y) {     
+    private GameOfLifeAgent GetAgent(int x, int y) {
       int width = Scenario.WidthParameter.Value.Value;
       int height = Scenario.HeightParameter.Value.Value;
@@ -79 +79 @@
         throw new Exception("invalid index");
 
-      int index = x + y * width;  
+      int index = x + y * width;
 
       return Agents[index] as GameOfLifeAgent;
@@ -86 +86 @@
     private void Initialize() {
       if (Scenario != null) {
-        Scenario.WidthParameter.ValueChanged += new EventHandler(WidthParameter_ValueChanged);
-        if(Scenario.WidthParameter.Value != null)
-          Scenario.WidthParameter.Value.ValueChanged += new EventHandler(Width_ValueChanged);
-        Scenario.HeightParameter.ValueChanged += new EventHandler(HeightParameter_ValueChanged);
-        if (Scenario.HeightParameter.Value != null)
-          Scenario.HeightParameter.Value.ValueChanged += new EventHandler(Height_ValueChanged);
+        Scenario.WidthParameter.Value.ValueChanged += new EventHandler(Width_ValueChanged);
+        Scenario.HeightParameter.Value.ValueChanged += new EventHandler(Height_ValueChanged);
       }
     }
@@ -103 +99 @@
     }
 
-    void HeightParameter_ValueChanged(object sender, EventArgs e) {
-      CreateAgents();
-    }
-
-    void WidthParameter_ValueChanged(object sender, EventArgs e) {
-      CreateAgents();
-    }
-
     public IEnumerable<GameOfLifeAgent> GetNeighbors(GameOfLifeAgent agent) {
       int width = Scenario.WidthParameter.Value.Value;
       int height = Scenario.HeightParameter.Value.Value;
       int index = Agents.IndexOf(agent);
-      
+
       List<GameOfLifeAgent> result = new List<GameOfLifeAgent>();
 
@@ -159 +147 @@
       int height = Scenario.HeightParameter.Value.Value;
 
-      Random rand = new Random();
+      var rand = new FastRandom();
 
       for (int i = 0; i < width * height; i++) {
@@ -190 +178 @@
 
       Results["Cells"].Value = cells;
-      
+
       IntValue currentIterations = (Results["CurrentIterations"].Value as IntValue);
       currentIterations.Value++;
@@ -206 +194 @@
         Results.Add(new Result("CurrentIterations", new IntValue(0)));
         Results.Add(new Result("Cells", new HeatMap(width, height)));
-      }      
+      }
 
       for (int i = start; i < iterations; i++) {
         cancellationToken.ThrowIfCancellationRequested();
-        
+
         base.Step();
-        UpdateResults();        
+        UpdateResults();
       }
     }