Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-11-20 20:14:49
|
Revision: 8006
http://fudaa.svn.sourceforge.net/fudaa/?rev=8006&view=rev
Author: deniger
Date: 2012-11-20 20:14:40 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierLoaderDefaultTest.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierReaderXMLTest.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManager.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManagerValidator.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/log/TestCrueTranslationReaderWriter.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java 2012-11-20 20:13:18 UTC (rev 8005)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/CrueConfigMetierReader.java 2012-11-20 20:14:40 UTC (rev 8006)
@@ -25,6 +25,7 @@
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.DateDurationConverter;
import org.fudaa.dodico.crue.common.contrat.XmlFileConfig;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoConfigLoi;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoConfigMetier;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoControleLoi;
@@ -39,7 +40,6 @@
import org.fudaa.dodico.crue.config.loi.EnumTypeLoi;
import org.fudaa.dodico.crue.config.loi.ItemTypeControleLoi;
import org.fudaa.dodico.crue.config.loi.ItemTypeExtrapolationLoi;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.joda.time.LocalDateTime;
/**
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierLoaderDefaultTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierLoaderDefaultTest.java 2012-11-20 20:13:18 UTC (rev 8005)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierLoaderDefaultTest.java 2012-11-20 20:14:40 UTC (rev 8006)
@@ -8,8 +8,8 @@
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
+import static org.junit.Assert.*;
import org.junit.Test;
-import static org.junit.Assert.*;
/**
* Un loader par default.
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierReaderXMLTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierReaderXMLTest.java 2012-11-20 20:13:18 UTC (rev 8005)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/CrueConfigMetierReaderXMLTest.java 2012-11-20 20:14:40 UTC (rev 8006)
@@ -7,6 +7,7 @@
import java.util.Map;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoConfigLoi;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoConfigLois;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoConfigMetier;
@@ -23,7 +24,6 @@
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoReference;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoValeurStrictable;
import org.fudaa.dodico.crue.config.CrueConfigMetierReaderXML.DaoVariables;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
import static org.junit.Assert.*;
import org.junit.Test;
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManager.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManager.java 2012-11-20 20:13:18 UTC (rev 8005)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManager.java 2012-11-20 20:14:40 UTC (rev 8006)
@@ -3,7 +3,6 @@
*/
package org.fudaa.dodico.crue.config.coeur;
-import org.fudaa.dodico.crue.config.coeur.CoeurManager;
import java.util.HashSet;
import java.util.Set;
import org.fudaa.dodico.crue.test.AbstractTestCase;
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManagerValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManagerValidator.java 2012-11-20 20:13:18 UTC (rev 8005)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/coeur/TestCoeurManagerValidator.java 2012-11-20 20:14:40 UTC (rev 8006)
@@ -3,9 +3,6 @@
*/
package org.fudaa.dodico.crue.config.coeur;
-import org.fudaa.dodico.crue.config.coeur.CoeurManager;
-import org.fudaa.dodico.crue.config.coeur.CoeurManagerValidator;
-import org.fudaa.dodico.crue.config.coeur.CoeurConfig;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/log/TestCrueTranslationReaderWriter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/log/TestCrueTranslationReaderWriter.java 2012-11-20 20:13:18 UTC (rev 8005)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/log/TestCrueTranslationReaderWriter.java 2012-11-20 20:14:40 UTC (rev 8006)
@@ -4,10 +4,6 @@
*/
package org.fudaa.dodico.crue.config.log;
-import org.fudaa.dodico.crue.config.log.CrueTranslationReaderWriter;
-import org.fudaa.dodico.crue.config.log.LienDocumentation;
-import org.fudaa.dodico.crue.config.log.LienMultimedia;
-import org.fudaa.dodico.crue.config.log.CrueLogTranslator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-21 09:08:00
|
Revision: 8355
http://fudaa.svn.sourceforge.net/fudaa/?rev=8355&view=rev
Author: deniger
Date: 2013-03-21 09:07:53 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-20 15:25:37 UTC (rev 8354)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -44,6 +44,10 @@
return (absValue > maxValue || absValue < minValue);
}
+ public NumberFormat getBase() {
+ return base;
+ }
+
@Override
public StringBuffer format(final double number, final StringBuffer toAppendTo, final FieldPosition pos) {
if (useScientific(number)) {
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java 2013-03-20 15:25:37 UTC (rev 8354)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatInfini.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -67,4 +67,11 @@
public NumberFormat getBase() {
return base;
}
+
+ public NumberFormat getRealBase() {
+ if (base instanceof NumberFormatChoice) {
+ return ((NumberFormatChoice) base).getBase();
+ }
+ return base;
+ }
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-20 15:25:37 UTC (rev 8354)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -31,7 +31,7 @@
if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
- int nbDec = Math.abs((int) Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison)));
+ int nbDec = Math.abs((int) Math.floor(Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison))));
NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
if (numberFormat == null) {
numberFormat = new DecimalFormat();
Added: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2013-03-21 09:07:53 UTC (rev 8355)
@@ -0,0 +1,35 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.config.ccm;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class PropertyFormaterBuilderTest {
+
+ public PropertyFormaterBuilderTest() {
+ }
+
+ @Test
+ public void testCreateFormatter() {
+ test(1e-2, 2, 1e-3, 3);
+ test(1e-10, 10, 1e-22, 22);
+ test(2e-2, 2, 2e-3, 3);
+ test(3e-10, 10, 3e-22, 22);
+ }
+
+ protected void test(double comparaison, int comparaisonFractionDigits, double presentation, int presentationFractionDigits) {
+ PropertyFormaterBuilder builder = new PropertyFormaterBuilder();
+ PropertyEpsilon epsilon = new PropertyEpsilon(comparaison, presentation);
+ PropertyNature property = new PropertyNature("test", epsilon, "none", new PropertyTypeNumerique("Tnu_Reel", "", 1e23));
+ NumberFormatInfini formatter = (NumberFormatInfini) builder.getFormatter(property, DecimalFormatEpsilonEnum.COMPARISON);
+ assertEquals(comparaisonFractionDigits, formatter.getRealBase().getMaximumFractionDigits());
+ formatter = (NumberFormatInfini) builder.getFormatter(property, DecimalFormatEpsilonEnum.PRESENTATION);
+ assertEquals(presentationFractionDigits, formatter.getRealBase().getMaximumFractionDigits());
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-21 16:01:16
|
Revision: 8356
http://fudaa.svn.sourceforge.net/fudaa/?rev=8356&view=rev
Author: deniger
Date: 2013-03-21 16:01:07 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-21 09:07:53 UTC (rev 8355)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-21 16:01:07 UTC (rev 8356)
@@ -31,7 +31,11 @@
if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
- int nbDec = Math.abs((int) Math.floor(Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison))));
+ double epsilon = nature.getEpsilon().getEpsilon(presentionOrComparison);
+ if (DecimalFormatEpsilonEnum.COMPARISON.equals(presentionOrComparison)) {
+ epsilon = epsilon / 10;
+ }
+ int nbDec = Math.abs((int) Math.floor(Math.log10(epsilon)));
NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
if (numberFormat == null) {
numberFormat = new DecimalFormat();
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2013-03-21 09:07:53 UTC (rev 8355)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2013-03-21 16:01:07 UTC (rev 8356)
@@ -17,10 +17,10 @@
@Test
public void testCreateFormatter() {
- test(1e-2, 2, 1e-3, 3);
- test(1e-10, 10, 1e-22, 22);
- test(2e-2, 2, 2e-3, 3);
- test(3e-10, 10, 3e-22, 22);
+ test(1e-2, 3, 1e-3, 3);
+ test(1e-10, 11, 1e-22, 22);
+ test(2e-2, 3, 2e-3, 3);
+ test(3e-10, 11, 3e-22, 22);
}
protected void test(double comparaison, int comparaisonFractionDigits, double presentation, int presentationFractionDigits) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-01-31 18:18:54
|
Revision: 8592
http://sourceforge.net/p/fudaa/svn/8592
Author: deniger
Date: 2014-01-31 18:18:49 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
CRUE-599
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java
trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java 2014-01-31 18:17:11 UTC (rev 8591)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java 2014-01-31 18:18:49 UTC (rev 8592)
@@ -27,7 +27,7 @@
private final String nom;
private final String displayName;
private final PropertyTypeNumerique typeNumerique;
- private boolean isEnum;
+ private final boolean isEnum;
private final List<ItemEnum> enumValues;
private NumberFormat presentationFormat;
private NumberFormat comparisonFormat;
Modified: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2014-01-31 18:17:11 UTC (rev 8591)
+++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilderTest.java 2014-01-31 18:18:49 UTC (rev 8592)
@@ -18,6 +18,8 @@
@Test
public void testCreateFormatter() {
test(1e-2, 3, 1e-3, 3);
+ test(1e-3, 4, 1e-3, 3);
+ test(1e-5, 6, 1e-5, 5);
test(1e-10, 11, 1e-22, 22);
test(2e-2, 3, 2e-3, 3);
test(3e-10, 11, 3e-22, 22);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X