halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Undo accidental commits

Browse Source
This commit is contained in:
Marcel Kronfeld 2010-06-09 15:43:34 +00:00
parent fe36c2ee29
commit 6c277c5960
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/EvA2.props
View File

@ -16,6 +16,3 @@ ModulePackage = eva2.server.modules
# filter class for modules. Do not alter! # filter class for modules. Do not alter!
ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter
# Full EvA2 version number
EvA2Version = 2.043

28
src/eva2/server/stat/AbstractStatistics.java
View File

@ -956,8 +956,6 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
lastSols = (opt!=null) ? new Population(opt.getAllSolutions().getSolutions()) : pop; lastSols = (opt!=null) ? new Population(opt.getAllSolutions().getSolutions()) : pop;
// Pair<String,Double[]> addData = getOutputData(informerList, lastSols); // Pair<String,Double[]> addData = getOutputData(informerList, lastSols);
// System.out.println("lastSols size: " + 500*PSymbolicRegression.getAvgIndySize(lastSols));
// System.out.println("Mem use: " + getMemoryUse());
Pair<String,Object[]> addData = getOutputData(informerList, lastSols); Pair<String,Object[]> addData = getOutputData(informerList, lastSols);
if (doTextOutput()) { // this is where the text output is actually written if (doTextOutput()) { // this is where the text output is actually written
if (printLineByVerbosity(iterationCounter)) { if (printLineByVerbosity(iterationCounter)) {
@ -1009,32 +1007,6 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
iterationCounter++; 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 * Returns true if the given iteration is a verbose one according to StatsParameter - meaning