diff --git a/resources/EvA2.props b/resources/EvA2.props index d9800fe9..9b954cbd 100644 --- a/resources/EvA2.props +++ b/resources/EvA2.props @@ -16,6 +16,3 @@ ModulePackage = eva2.server.modules # filter class for modules. Do not alter! ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter - -# Full EvA2 version number -EvA2Version = 2.043 \ No newline at end of file diff --git a/src/eva2/server/stat/AbstractStatistics.java b/src/eva2/server/stat/AbstractStatistics.java index 71e55b36..064a5af7 100644 --- a/src/eva2/server/stat/AbstractStatistics.java +++ b/src/eva2/server/stat/AbstractStatistics.java @@ -956,8 +956,6 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter lastSols = (opt!=null) ? new Population(opt.getAllSolutions().getSolutions()) : pop; // Pair addData = getOutputData(informerList, lastSols); -// System.out.println("lastSols size: " + 500*PSymbolicRegression.getAvgIndySize(lastSols)); -// System.out.println("Mem use: " + getMemoryUse()); Pair addData = getOutputData(informerList, lastSols); if (doTextOutput()) { // this is where the text output is actually written if (printLineByVerbosity(iterationCounter)) { @@ -1009,32 +1007,6 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter iterationCounter++; } - - private static long getMemoryUse(){ - putOutTheGarbage(); - long totalMemory = Runtime.getRuntime().totalMemory(); - - putOutTheGarbage(); - long freeMemory = Runtime.getRuntime().freeMemory(); - - return (totalMemory - freeMemory); - } - private static void putOutTheGarbage() { - collectGarbage(); - collectGarbage(); - } - - private static void collectGarbage() { - try { - System.gc(); - Thread.currentThread().sleep(100); - System.runFinalization(); - Thread.currentThread().sleep(100); - } - catch (InterruptedException ex){ - ex.printStackTrace(); - } - } /** * Returns true if the given iteration is a verbose one according to StatsParameter - meaning