Algunos cambios de vete a saber cuando

Author: fergunet

PlanetWars/META-INF/MANIFEST.MF

@@ -10,8 +10,16 @@ Import-Package: es.ugr.osgiliath,
  es.ugr.osgiliath.evolutionary.basiccomponents.individuals,
  es.ugr.osgiliath.evolutionary.elements,
  es.ugr.osgiliath.evolutionary.individual,
+ es.ugr.osgiliath.planetwars,
+ es.ugr.osgiliath.planetwars.agent,
+ es.ugr.osgiliath.planetwars.components,
+ es.ugr.osgiliath.planetwars.fitness,
  es.ugr.osgiliath.problem,
  es.ugr.osgiliath.util.impl,
  es.ugr.osgiliath.utils
 Bundle-ClassPath: lib/com.springsource.javassist-3.15.0.GA.jar,
  .
+Export-Package: es.ugr.osgiliath.planetwars,
+ es.ugr.osgiliath.planetwars.agent,
+ es.ugr.osgiliath.planetwars.components,
+ es.ugr.osgiliath.planetwars.fitness

PlanetWars/environment/launch.sh

@@ -169,7 +169,16 @@ public void setup(Properties props) {
 	}
 	@Override
 	public void statsX(String message, String appendix) {
-		// TODO Auto-generated method stub
+		
+		try{
+			FileWriter fstream = new FileWriter(filename,true); //EXISTENT FILE
+			BufferedWriter out = new BufferedWriter(fstream);
+			long time =  (System.currentTimeMillis() -initTime) / 1000;
+			out.write(message);
+			out.close();
+		}catch(Exception ex){
+			ex.printStackTrace();
+		}
 
 	}
 

PlanetWars/src/es/ugr/osgiliath/planetwars/PlanetWarsLogger.java

@@ -21,4 +21,6 @@ public class PlanetWarsParameters {
 
 	public static final String MAX_DEPTH = "planetwars.depth.max";
 	public static final String INITIAL_DEPTH = "planetwars.depth.initial";
+	
+	public static final String TEST = "test";
 }

PlanetWars/src/es/ugr/osgiliath/planetwars/PlanetWarsParameters.java

@@ -12,6 +12,7 @@
 import es.ugr.osgiliath.evolutionary.individual.Fitness;
 import es.ugr.osgiliath.evolutionary.individual.Individual;
 import es.ugr.osgiliath.planetwars.fitness.PlanetWarsFitnessCalculator;
+import es.ugr.osgiliath.planetwars.fitness.PlanetWarsHierarchicalFitness;
 import es.ugr.osgiliath.utils.Logger;
 
 public class PlanetWarsReplacer extends OsgiliathService implements Replacer {
@@ -52,7 +53,34 @@ public void select(Population pop, ArrayList<Individual> parents,
 
 		System.out.println("BEST FITNESS "+ pop.getNBestIndividuals(1).get(0));
 
-		this.analyze(pop);
+		//this.analyze(pop);
+		//PRINTING ALL THE POPULATION		
+		List<Individual> all = pop.getAllIndividuals();
+		Debug debug = new Debug();
+		for(Individual inda:all){
+			String message = "";
+			BasicIndividual ind = (BasicIndividual) inda;
+						
+			int indSize = ((TreeGenome)ind.getGenome()).getDepth();
+			int indNodes = ((TreeGenome)ind.getGenome()).getNumberOfNodes();
+			int age = ((TreeGenome)ind.getGenome()).getNumberOfNodes();
+			String treeString = debug.resumeTree(inda);
+			String treelargo = debug.writePlanetWarsTree((TreeGenome)ind.getGenome());
+			double victories = ((PlanetWarsHierarchicalFitness) ind.getFitness()).getPrimaryFitness();
+			double turns = ((PlanetWarsHierarchicalFitness) ind.getFitness()).getSecondaryFitness();
+			//IT,NUM_EVALUATIONS,TIME,SIM,SIZE,DEPTH,AGE,STAMP,TREE,VICTORIES,TURNS
+			message = currentGeneration+","+
+			"0"+","+
+			"0"+","+
+			indNodes+","+
+			indSize+","+
+			age+","+
+			treeString+","+
+			treelargo+","+
+			victories+
+			turns+"\n";
+			this.log.statsX(message, "");
+		}
 	}
 
 
@@ -117,14 +145,14 @@ public void analyze(Population pop){
 		PlanetWarsFitnessCalculator fc = new PlanetWarsFitnessCalculator(1);
 		String tree = fc.writePlanetWarsTree((TreeGenome)bestI.getGenome());
 		log.stats(
-				bestFitness.toString()+";"+
-				avgFitness.toString()+";"+
-				bestSize+";"+
-				averageSize+";"+
-				bestNodes+";"+
-				averageNodes+";"+
-				bestAge+";"+
-				averageAge+";"+
+				bestFitness.toString()+","+
+				avgFitness.toString()+","+
+				bestSize+","+
+				averageSize+","+
+				bestNodes+","+
+				averageNodes+","+
+				bestAge+","+
+				averageAge+","+
 				tree+"\n"
 				);
 	}

PlanetWars/src/es/ugr/osgiliath/planetwars/PlanetWarsReplacer.java

@@ -6,29 +6,26 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 
-import javax.swing.plaf.basic.BasicInternalFrameTitlePane.MaximizeAction;
-
 import es.ugr.osgiliath.OsgiliathService;
 import es.ugr.osgiliath.evolutionary.basiccomponents.genomes.GenericTreeNode;
 import es.ugr.osgiliath.evolutionary.basiccomponents.genomes.TreeGenome;
 import es.ugr.osgiliath.evolutionary.basiccomponents.individuals.BasicIndividual;
 import es.ugr.osgiliath.evolutionary.elements.FitnessCalculator;
-import es.ugr.osgiliath.evolutionary.elements.StopCriterion;
 import es.ugr.osgiliath.evolutionary.individual.Fitness;
 import es.ugr.osgiliath.evolutionary.individual.Individual;
+import es.ugr.osgiliath.planetwars.Debug;
 import es.ugr.osgiliath.planetwars.PlanetWarsParameters;
-import es.ugr.osgiliath.evolutionary.basicimplementations.stopcriterions.MaxEvaluationsStopCriterionNoOSGi;
-
+ 
 public class PlanetWarsFitnessCalculator extends OsgiliathService implements
 		FitnessCalculator{
 
 	int logFile = 0;
 
 	public PlanetWarsFitnessCalculator(int logFile) {
 		this.logFile = logFile;
+		Debug d = new Debug();
 	}
 
 

PlanetWars/src/es/ugr/osgiliath/planetwars/fitness/PlanetWarsFitnessCalculator.java

@@ -6,6 +6,7 @@ public class PlanetWarsHierarchicalFitness implements Fitness{
 
 	protected double primaryFitness;
 	protected double secondaryFitness;
+	protected double optional;
 
 	public double getPrimaryFitness() {
 		return primaryFitness;
@@ -22,6 +23,14 @@ public double getSecondaryFitness() {
 	public void setSecondaryFitness(double totalTurns) {
 		this.secondaryFitness = totalTurns;
 	}
+	
+	public double getOptional() {
+		return optional;
+	}
+
+	public void setOptional(double totalTurns) {
+		this.optional = totalTurns;
+	}
 
 	public PlanetWarsHierarchicalFitness(double wins, double turns){
 		this.secondaryFitness = turns;