Refactored result outputs

src/main/java/fi/luke/vips/model/cerealmodels/FinnCerealModels.java

@@ -138,7 +138,7 @@ public class FinnCerealModels extends I18nImpl implements Model {
 			m.setCurrentDay(currentDate);
 			Result r = new ResultImpl();
 			m.setTemperature(dailyTemperature2.get(i).getValue());
-			r.setValue(pathogen, "ATemp", ""+dailyTemperature2.get(i).getValue());
+			r.setValue(FinnCerealModels.MODEL_ID.toString() + "." + pathogen, "ATemp", ""+dailyTemperature2.get(i).getValue());
 			Date test = dailyRainfall2.get(i).getTimeMeasured();
 			if(!currentDate.equals(test)) {
 				throw new ModelExcecutionException("Temperature and daily rainfall are from different dates!");
@@ -160,12 +160,12 @@ public class FinnCerealModels extends I18nImpl implements Model {
 				throw new ModelExcecutionException("Leaf wetness hours data not found!");								
 			}
 			m.setDailyLeafWetnessDuration(wetHours);
-			r.setValue(pathogen, "LeafWet", "" + wetHours);
+			r.setValue(FinnCerealModels.MODEL_ID.toString() , "LeafWet", "" + wetHours);
 			// TODO does not take into account the disease progress at the moment!
-			r.setValue(pathogen, "BASE_RISK", "" + m.getBaseRisk());
-			r.setValue(pathogen, "DAILY_RISK", ""+ m.getDailyRisk());
+			r.setValue(FinnCerealModels.MODEL_ID.toString() + "." + pathogen, "BASE_RISK", "" + m.getBaseRisk());
+			r.setValue(FinnCerealModels.MODEL_ID.toString() + "." + pathogen, "DAILY_RISK", ""+ m.getDailyRisk());
 			accumulatedRisk += m.getAccumulatedRisk();
-			r.setValue(pathogen, "DAILY_ACCUMULATION", "" + accumulatedRisk);
+			r.setValue(FinnCerealModels.MODEL_ID.toString() + "." + pathogen, "DAILY_ACCUMULATION", "" + accumulatedRisk);
 			r.setValidTimeStart(currentDate);
 			// TODO create means to dynamically set warning statuses
 			if(accumulatedRisk < noRisk) {

src/test/java/fi/luke/vips/model/cerealmodels/FinnCerealModelsTest.java

@@ -93,9 +93,9 @@ public class FinnCerealModelsTest {
 			if(printOutput) {
 				System.out.println("date;avg temp;wet hours;base risk; daily risk;accumulated risk");
 				for(Result r: results) {
-					System.out.println(r.getValidTimeStart().toString() + ";" + r.getValue(modelName, "ATemp") + ";" 
-				+ r.getValue(modelName, "LeafWet") + ";" + r.getValue(modelName, "BASE_RISK") + ";" 
-				+ r.getValue(modelName, "DAILY_RISK") + ";" + r.getValue(modelName, "DAILY_ACCUMULATION"));
+					System.out.println(r.getValidTimeStart().toString() + ";" + r.getValue(pm.getModelId().toString() + "." + modelName, "ATemp") + ";" 
+				+ r.getValue(pm.getModelId().toString(), "LeafWet") + ";" + r.getValue(pm.getModelId().toString() + "." + modelName, "BASE_RISK") + ";" 
+				+ r.getValue(pm.getModelId().toString() + "." + modelName, "DAILY_RISK") + ";" + r.getValue(pm.getModelId().toString() + "." + modelName, "DAILY_ACCUMULATION"));
 				} 	
 			}
 			return results;