From 211c7a4477f5b272987903fece0ae4b26b521610 Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Mon, 15 Sep 2008 08:05:55 +0000
Subject: [PATCH] BugBuster in PSO

---
 src/eva2/server/go/strategies/ParticleSwarmOptimization.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java
index c0cee616..0946cdf9 100644
--- a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java
+++ b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java
@@ -1429,7 +1429,9 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se
 			init();
 		} else for (int i=0; i<pop.size(); i++) {
 			AbstractEAIndividual indy = pop.getEAIndividual(i);
-			if (indy.hasData(partTypeKey)) {
+			if (indy==null) {
+				System.err.println("Error in PSO.setPopulation!");
+			} else if (!indy.hasData(partTypeKey)) {
 				initIndividualDefaults(indy);
 				initIndividualMemory(indy);
 				indy.putData(indexKey, i);