Skip to content
Snippets Groups Projects
Commit c9f6dc27 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

Merge branch 'feature/vipsutv-372-oatflowerm' into develop

parents ff1a6a61 42910159
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<version>2.4.1</version> <version>2.4.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>no.nibio.vips.common</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>2022.1</version> <version>2022.1</version>
</dependency> </dependency>
......
...@@ -122,6 +122,7 @@ public class OatFloweringModel extends I18nImpl implements Model{ ...@@ -122,6 +122,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
private Result initResult(WeatherObservation obs) private Result initResult(WeatherObservation obs)
{ {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setFirstDayOfWeek(Calendar.MONDAY);
Result result = new ResultImpl(); Result result = new ResultImpl();
result.setValidTimeStart(obs.getTimeMeasured()); result.setValidTimeStart(obs.getTimeMeasured());
......
...@@ -119,7 +119,7 @@ public class OatFloweringModelTest { ...@@ -119,7 +119,7 @@ public class OatFloweringModelTest {
System.out.println("Result: [" + result.getValidTimeStart() + "]" + result.getAllValues()); System.out.println("Result: [" + result.getValidTimeStart() + "]" + result.getAllValues());
}*/ }*/
assertEquals("27", weekResult); assertEquals("26", weekResult);
assertEquals("60", zReached); assertEquals("60", zReached);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment