Skip to content

Commit ec26dbe

Browse files
author
Hugo Marcellin
committed
Merge main
2 parents 5aed5e5 + 50ec17b commit ec26dbe

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,13 @@
4242
</developers>
4343

4444
<properties>
45-
46-
<gridsuite-dependencies.version>44.0.0</gridsuite-dependencies.version>
45+
<gridsuite-dependencies.version>44.1.0</gridsuite-dependencies.version>
4746
<liquibase-hibernate-package>org.gridsuite.sensitivityanalysis.server</liquibase-hibernate-package>
4847
<db-util.version>1.0.5</db-util.version>
4948
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
5049
<sonar.organization>gridsuite</sonar.organization>
5150
<sonar.projectKey>org.gridsuite:sensitivity-analysis-server</sonar.projectKey>
52-
53-
<!--
54-
To remove after when using gridsuite dependencies release referencing filter 1.12.0 version or greater
55-
and computation version containing merged PR: https://github.com/gridsuite/computation/pull/13
56-
-->
57-
<gridsuite-filter.version>1.12.0</gridsuite-filter.version>
51+
<!-- To remove after when using gridsuite dependencies release and computation version containing merged PR: https://github.com/gridsuite/computation/pull/19 -->
5852
<gridsuite-computation.version>1.7.0-SNAPSHOT</gridsuite-computation.version>
5953
</properties>
6054

@@ -177,7 +171,6 @@
177171
<dependency>
178172
<groupId>org.gridsuite</groupId>
179173
<artifactId>gridsuite-filter</artifactId>
180-
<version>${gridsuite-filter.version}</version>
181174
</dependency>
182175
<dependency>
183176
<groupId>org.gridsuite</groupId>

src/test/java/org/gridsuite/sensitivityanalysis/server/SensitivityAnalysisControllerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,16 +478,16 @@ void csvExportTest() throws Exception {
478478
expectedCsvLines.put(Pair.of(splitLine[0], splitLine[1]), Arrays.asList(getValueFromString(splitLine[2], language), getValueFromString(splitLine[3], language)));
479479
}
480480
assertEquals(75.51, expectedCsvLines.get(Pair.of("L1-5-1", "B2-G")).get(0), Math.pow(10, -6));
481-
assertEquals(-0.173, expectedCsvLines.get(Pair.of("L1-5-1", "B2-G")).get(1), Math.pow(10, -6));
481+
assertEquals(-0.086, expectedCsvLines.get(Pair.of("L1-5-1", "B2-G")).get(1), Math.pow(10, -6));
482482

483483
assertEquals(75.51, expectedCsvLines.get(Pair.of("L1-5-1", "B1-G")).get(0), Math.pow(10, -6));
484-
assertEquals(0.0, expectedCsvLines.get(Pair.of("L1-5-1", "B1-G")).get(1));
484+
assertEquals(0.086, expectedCsvLines.get(Pair.of("L1-5-1", "B1-G")).get(1));
485485

486486
assertEquals(73.238, expectedCsvLines.get(Pair.of("L2-3-1", "B2-G")).get(0), Math.pow(10, -6));
487-
assertEquals(0.028, expectedCsvLines.get(Pair.of("L2-3-1", "B2-G")).get(1), Math.pow(10, -6));
487+
assertEquals(0.014, expectedCsvLines.get(Pair.of("L2-3-1", "B2-G")).get(1), Math.pow(10, -6));
488488

489489
assertEquals(73.238, expectedCsvLines.get(Pair.of("L2-3-1", "B1-G")).get(0), Math.pow(10, -6));
490-
assertEquals(0.0, expectedCsvLines.get(Pair.of("L2-3-1", "B1-G")).get(1));
490+
assertEquals(-0.014, expectedCsvLines.get(Pair.of("L2-3-1", "B1-G")).get(1));
491491
}
492492
}
493493

0 commit comments

Comments
 (0)