Skip to content
Snippets Groups Projects
Commit 7d59da2d authored by BrunoDatoMeneses's avatar BrunoDatoMeneses
Browse files

ADD: calculate averageRegressionPerformanceIndicator once

parent eef73a98
Branches
No related tags found
2 merge requests!3Merge masters,!2Merge dev into develop
...@@ -89,6 +89,7 @@ public class Head extends AmoebaAgent { ...@@ -89,6 +89,7 @@ public class Head extends AmoebaAgent {
setContextFromPropositionWasSelected(false); setContextFromPropositionWasSelected(false);
getAmas().data.oldOracleValue = getAmas().data.oracleValue; getAmas().data.oldOracleValue = getAmas().data.oracleValue;
getAmas().data.oracleValue = getAmas().getPerceptions("oracle"); getAmas().data.oracleValue = getAmas().getPerceptions("oracle");
setAverageRegressionPerformanceIndicator();
/* The head memorize last used context agent */ /* The head memorize last used context agent */
lastUsedContext = bestContext; lastUsedContext = bestContext;
...@@ -1887,6 +1888,12 @@ public class Head extends AmoebaAgent { ...@@ -1887,6 +1888,12 @@ public class Head extends AmoebaAgent {
public Double getAverageRegressionPerformanceIndicator() { public Double getAverageRegressionPerformanceIndicator() {
return getAmas().data.averageRegressionPerformanceIndicator;
}
public void setAverageRegressionPerformanceIndicator() {
int numberOfRegressions = 0; int numberOfRegressions = 0;
if(activatedNeighborsContexts.size()>0) { if(activatedNeighborsContexts.size()>0) {
double meanRegressionPerformanceIndicator = 0.0; double meanRegressionPerformanceIndicator = 0.0;
...@@ -1895,13 +1902,14 @@ public class Head extends AmoebaAgent { ...@@ -1895,13 +1902,14 @@ public class Head extends AmoebaAgent {
numberOfRegressions+=1; numberOfRegressions+=1;
} }
assert numberOfRegressions != 0; assert numberOfRegressions != 0;
return (meanRegressionPerformanceIndicator/numberOfRegressions > getAmas().data.initRegressionPerformance) ? meanRegressionPerformanceIndicator/numberOfRegressions : getAmas().data.initRegressionPerformance; getAmas().data.averageRegressionPerformanceIndicator = (meanRegressionPerformanceIndicator/numberOfRegressions > getAmas().data.initRegressionPerformance) ? meanRegressionPerformanceIndicator/numberOfRegressions : getAmas().data.initRegressionPerformance;
} }
else{ else{
return getAmas().data.initRegressionPerformance; getAmas().data.averageRegressionPerformanceIndicator = getAmas().data.initRegressionPerformance;
} }
} }
public void proposition(Context c) { public void proposition(Context c) {
activatedContexts.add(c); activatedContexts.add(c);
......
...@@ -78,4 +78,6 @@ public class AmoebaData implements Serializable { ...@@ -78,4 +78,6 @@ public class AmoebaData implements Serializable {
public double[] executionTimesSums = new double[20]; public double[] executionTimesSums = new double[20];
public double initRegressionPerformance = 1.0; public double initRegressionPerformance = 1.0;
public double averageRegressionPerformanceIndicator;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment