diff --git a/src/main/java/no/bioforsk/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java b/src/main/java/no/bioforsk/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java index fd71412e2657b2616c174a4f6a7b8b64b09c7c7e..aea730e8a05ca2aa504ff766803f00f08ae58a9f 100644 --- a/src/main/java/no/bioforsk/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java +++ b/src/main/java/no/bioforsk/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java @@ -81,7 +81,7 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{ Date firstSeasonPestObservationDate = firstSeasonPestObservation != null ? new WeatherUtil().normalizeToExactDate(firstSeasonPestObservation.getTimeOfObservation(), this.timeZone) : null; - //System.out.println(this.dataMatrix.toCSV()); + Date currentDate = this.dataMatrix.getFirstDateWithParameterValue(DataMatrix.WET_DAY); Date endDate = this.dataMatrix.getLastDateWithParameterValue(DataMatrix.WET_DAY); Calendar cal = Calendar.getInstance(timeZone); @@ -233,20 +233,18 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{ this.dataMatrix = new DataMatrix(); WeatherUtil wUtil = new WeatherUtil(); this.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - + // Setting time zone this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone")); - + // Getting observation data this.pestObservations = this.getObjectMapper().convertValue(config.getConfigParameter("pestObservations"), new TypeReference<List<ObservationImpl>>(){}); if(this.pestObservations != null && ! this.pestObservations.isEmpty()) { for(Observation o:this.pestObservations) { - this.dataMatrix.setParamIntValueForDate(wUtil.normalizeToExactHour(o.getTimeOfObservation(), timeZone), DataMatrix.PEST_OBSERVED, 1); + this.dataMatrix.setParamIntValueForDate(wUtil.normalizeToExactDate(o.getTimeOfObservation(), timeZone), DataMatrix.PEST_OBSERVED, 1); } } - // Setting timezone - // Getting weather data List<WeatherObservation> observations = this.getObjectMapper().convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});