Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7725] trunk/soft/fudaa-crue/crue-server
|
From: <de...@us...> - 2012-10-08 16:23:27
|
Revision: 7725
http://fudaa.svn.sourceforge.net/fudaa/?rev=7725&view=rev
Author: deniger
Date: 2012-10-08 16:23:20 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
CRUE-306
Issue #CRUE-306 - Comparaison relative : erreur dans la formule
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/nb-configuration.xml
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDouble.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterPoint2D.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java
Modified: trunk/soft/fudaa-crue/crue-server/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/nb-configuration.xml 2012-10-08 06:39:12 UTC (rev 7724)
+++ trunk/soft/fudaa-crue/crue-server/nb-configuration.xml 2012-10-08 16:23:20 UTC (rev 7725)
@@ -6,6 +6,11 @@
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
+ <config-data xmlns="http://www.netbeans.org/ns/maven-config-data/1">
+ <configurations>
+ <configuration id="release" profiles="release, noIntegrationTests"/>
+ </configurations>
+ </config-data>
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
@@ -14,11 +19,5 @@
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.compile.on.save>test</netbeans.compile.on.save>
- <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
</properties>
- <config-data xmlns="http://www.netbeans.org/ns/maven-config-data/1">
- <configurations>
- <configuration id="release" profiles="release, noIntegrationTests"/>
- </configurations>
- </config-data>
</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDouble.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDouble.java 2012-10-08 06:39:12 UTC (rev 7724)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterDouble.java 2012-10-08 16:23:20 UTC (rev 7725)
@@ -22,7 +22,7 @@
boolean same = isSameDouble(o1.doubleValue(), o2.doubleValue());
if (!same && context.isActivated(TestOption.RELATIVE_FOR_DOUBLE)) {
double diffRelative = getDiffRelative(o1.doubleValue(), o2.doubleValue());
- same = diffRelative <= super.relativeEpsilonValue;
+ same = (diffRelative <= super.relativeEpsilonValue);
}
return same;
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterPoint2D.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterPoint2D.java 2012-10-08 06:39:12 UTC (rev 7724)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterPoint2D.java 2012-10-08 16:23:20 UTC (rev 7725)
@@ -1,9 +1,12 @@
package org.fudaa.dodico.crue.comparaison.tester;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.fudaa.dodico.crue.metier.emh.Point2D;
/**
- * @author denf01a @creation 22 juin 2009
+ * @author denf01a
+ * @creation 22 juin 2009
* @version
*/
public class EqualsTesterPoint2D extends AbstractEqualsTester<Point2D> {
@@ -32,7 +35,11 @@
if (abs == null) {//cas des enums
isSame = ((int) o1.getAbscisse()) == ((int) o2.getAbscisse());
} else {
- isSame = abs.isSameDouble(o1.getAbscisse(), o2.getAbscisse());
+ try {
+ isSame = abs.isSame(o1.getAbscisse(), o2.getAbscisse(), null, context);
+ } catch (Exception exception) {
+ Logger.getLogger(EqualsTesterPoint2D.class.getName()).log(Level.INFO, "message {0}", exception);
+ }
}
if (!isSame) {
return false;
@@ -40,7 +47,11 @@
if (ord == null) {//cas des enums
isSame = ((int) o1.getOrdonnee()) == ((int) o2.getOrdonnee());
} else {
- isSame = ord.isSameDouble(o1.getOrdonnee(), o2.getOrdonnee());
+ try {
+ isSame = ord.isSame(o1.getOrdonnee(), o2.getOrdonnee(), null, context);
+ } catch (Exception exception) {
+ Logger.getLogger(EqualsTesterPoint2D.class.getName()).log(Level.INFO, "message {0}", exception);
+ }
}
return isSame;
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java 2012-10-08 06:39:12 UTC (rev 7724)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java 2012-10-08 16:23:20 UTC (rev 7725)
@@ -44,7 +44,6 @@
props.addAll(values2.keySet());
values1 = EqualsTesterResultatCalcul.completeIfNeeded(values1, props);
values2 = EqualsTesterResultatCalcul.completeIfNeeded(values2, props);
-// ResultatTest resLocal = new ResultatTest("", "", "compare.resultat.diff", resultatKey.toString());
LazyDynaMap dynaMap1 = new LazyDynaMap("ResPrtGeo", values1);
dynaMap1.setReturnNull(true);
LazyDynaMap dynaMap2 = new LazyDynaMap("ResPrtGeo", values2);
@@ -52,6 +51,7 @@
ResultatTest tmp = new ResultatTest();
List<String> orderedProp = new ArrayList<String>(props);
Collections.sort(orderedProp);
+ boolean activated = context.isActivated(TestOption.RELATIVE_FOR_DOUBLE);
isEquals = beanTester.isSame(dynaMap1, dynaMap2, tmp, context, orderedProp);
if (!isEquals) {
res.addDiffs(tmp.getFils().get(0).getFils());
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java 2012-10-08 06:39:12 UTC (rev 7724)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java 2012-10-08 16:23:20 UTC (rev 7725)
@@ -39,7 +39,25 @@
fail(e.getMessage());
}
}
-
+
+ public void testEqualsTesterLoiFFRelative() {
+ final LoiFF loi1 = createLoi();
+ final LoiFF loi2 = createLoi();
+ //le delta relatif est <1.e-6
+ loi1.getEvolutionFF().getPtEvolutionFF().get(0).setAbscisse(2000.1234);
+ loi2.getEvolutionFF().getPtEvolutionFF().get(0).setAbscisse(2000.1235);
+ final EqualsTesterLoi tester = new EqualsTesterLoi(new FactoryEqualsTester(CrueConfigMetierLoaderDefaultTest.DEFAULT));
+ final ResultatTest resTest = new ResultatTest();
+ final TesterContextImpl ctx = new TesterContextImpl(null);
+ try {
+ assertFalse("no same same in absolute",tester.isSameSafe(loi1, loi2, resTest, ctx));//cas non relatif
+ ctx.activate(TestOption.RELATIVE_FOR_DOUBLE);
+ assertTrue("same in relatif",tester.isSameSafe(loi1, loi2, resTest, ctx));//cas
+ } catch (final Exception e) {
+ fail(e.getMessage());
+ }
+ }
+
public void testEqualsTesterLoiZFirst() {
final LoiFF createLoi1 = createLoi();
final LoiFF createLoi2 = createLoi();
@@ -74,7 +92,7 @@
fail(e.getMessage());
}
}
-
+
public void testEqualsTesterLoiZIgnoreFirst() {
final LoiFF createLoi1 = createLoi();
final LoiFF createLoi2 = createLoi();
@@ -129,7 +147,7 @@
fail(e.getMessage());
}
}
-
+
private static LoiFF createLoi() {
final LoiFF loi = new LoiFF();
loi.setType(EnumTypeLoi.LoiZBeta);
@@ -142,7 +160,7 @@
loi.setNom("Titi");
return loi;
}
-
+
private static LoiDF createLoiDF() {
final LoiDF loi = new LoiDF();
loi.setType(EnumTypeLoi.LoiTOuv);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
