Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java [UTF-8] Sun Mar 16 23:30:17 2014 @@ -58,6 +58,8 @@ import org.junit.BeforeClass; org.apache.sis.parameter.ParametersTest.class, org.apache.sis.parameter.ParameterBuilderTest.class, org.apache.sis.parameter.ParameterFormatTest.class, + org.apache.sis.parameter.TensorParametersTest.class, + org.apache.sis.parameter.TensorValuesTest.class, org.apache.sis.referencing.datum.BursaWolfParametersTest.class, org.apache.sis.referencing.datum.TimeDependentBWPTest.class, org.apache.sis.referencing.datum.DefaultEllipsoidTest.class,
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java [UTF-8] Sun Mar 16 23:30:17 2014 @@ -199,8 +199,9 @@ public final class Numerics extends Stat } /** - * Returns {@code true} if the given doubles are equals. Positive and negative zero are - * considered different, while a NaN value is considered equal to all other NaN values. + * Returns {@code true} if the given doubles are equal. + * Positive and negative zeros are considered different. + * NaN values are considered equal to all other NaN values. * * @param o1 The first value to compare. * @param o2 The second value to compare. @@ -213,6 +214,18 @@ public final class Numerics extends Stat } /** + * Returns {@code true} if the given doubles are equal, ignoring the sign of zero values. + * NaN values are considered equal to all other NaN values. + * + * @param o1 The first value to compare. + * @param o2 The second value to compare. + * @return {@code true} if both values are equal. + */ + public static boolean equalsIgnoreZeroSign(final double o1, final double o2) { + return (o1 == o2) || Double.doubleToLongBits(o1) == Double.doubleToLongBits(o2); + } + + /** * Returns {@code true} if the given values are approximatively equal, * up to the {@linkplain #COMPARISON_THRESHOLD comparison threshold}. * Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] Sun Mar 16 23:30:17 2014 @@ -708,6 +708,11 @@ public final class Errors extends Indexe public static final short UnexpectedFileFormat_2 = 111; /** + * Parameter “{0}” was not expected. + */ + public static final short UnexpectedParameter_1 = 152; + + /** * Parameter “{0}” has no unit. */ public static final short UnitlessParameter_1 = 139; Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Sun Mar 16 23:30:17 2014 @@ -153,6 +153,7 @@ UnexpectedChange_1 = Unex UnexpectedEndOfFile_1 = Unexpected end of file while reading \u201c{0}\u201d. UnexpectedEndOfString_1 = More characters were expected at the end of \u201c{0}\u201d. UnexpectedFileFormat_2 = File \u201c{1}\u201d seems to be encoded in an other format than {0}. +UnexpectedParameter_1 = Parameter \u201c{0}\u201d was not expected. UnitlessParameter_1 = Parameter \u201c{0}\u201d has no unit. UnknownAuthority_1 = Authority \u201c{0}\u201d is unknown. UnknownAxisDirection_1 = Axis direction \u201c{0}\u201d is unknown. Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Sun Mar 16 23:30:17 2014 @@ -142,7 +142,8 @@ UnexpectedChange_1 = Chan UnexpectedEndOfFile_1 = Fin de fichier inattendue lors de la lecture de \u00ab\u202f{0}\u202f\u00bb. UnexpectedEndOfString_1 = D\u2019autres caract\u00e8res \u00e9taient attendus \u00e0 la fin du texte \u00ab\u202f{0}\u202f\u00bb. UnexpectedFileFormat_2 = Le fichier \u00ab\u202f{1}\u202f\u00bb semble \u00eatre encod\u00e9 dans un autre format que {0}. -UnitlessParameter_1 = Le param\u00e8tre \u201c{0}\u201d n\u2019a pas d\u2019unit\u00e9. +UnexpectedParameter_1 = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb est inattendu. +UnitlessParameter_1 = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019a pas d\u2019unit\u00e9. UnknownAuthority_1 = L\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue. UnknownAxisDirection_1 = La direction d\u2019axe \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue. UnknownCommand_1 = La commande \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue. Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] Sun Mar 16 23:30:17 2014 @@ -90,6 +90,11 @@ public final class Vocabulary extends In public static final short BarometricAltitude = 5; /** + * Cardinality + */ + public static final short Cardinality = 76; + + /** * Character encoding */ public static final short CharacterEncoding = 6; @@ -245,6 +250,11 @@ public final class Vocabulary extends In public static final short Longitude = 32; /** + * Mandatory + */ + public static final short Mandatory = 77; + + /** * Maximum value */ public static final short MaximumValue = 33; @@ -280,6 +290,11 @@ public final class Vocabulary extends In public static final short NumberOfValues = 39; /** + * Obligation + */ + public static final short Obligation = 78; + + /** * {0} ({1} of {2}) */ public static final short Of_3 = 40; @@ -295,6 +310,11 @@ public final class Vocabulary extends In public static final short OperatingSystem = 42; /** + * Optional + */ + public static final short Optional = 79; + + /** * Options */ public static final short Options = 43; Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] Sun Mar 16 23:30:17 2014 @@ -21,6 +21,7 @@ AngularMinutes = Minutes AngularSeconds = Seconds Attributes = Attributes BarometricAltitude = Barometric altitude +Cardinality = Cardinality CharacterEncoding = Character encoding Classpath = Classpath Code_1 = {0} code @@ -52,6 +53,7 @@ LocalConfiguration = Local configur Locale = Locale Localization = Localization Logging = Logging +Mandatory = Mandatory MaximumValue = Maximum value MeanValue = Mean value MinimumValue = Minimum value @@ -59,9 +61,11 @@ ModifiedJulian = Modified Julia Name = Name NumberOfValues = Number of values NumberOfNaN = Number of \u2018NaN\u2019 +Obligation = Obligation Of_3 = {0} ({1} of {2}) Offset = Offset OperatingSystem = Operating system +Optional = Optional Options = Options Others = Others OtherSurface = Other surface Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] Sun Mar 16 23:30:17 2014 @@ -21,6 +21,7 @@ AngularMinutes = Minutes AngularSeconds = Secondes Attributes = Attributs BarometricAltitude = Altitude barom\u00e9trique +Cardinality = Cardinalit\u00e9 CharacterEncoding = Encodage des caract\u00e8res Classpath = Chemin de classes Code_1 = Code {0} @@ -52,6 +53,7 @@ LocalConfiguration = Configuration Locale = Locale Localization = R\u00e9gionalisation Logging = Journalisation +Mandatory = Requis MaximumValue = Valeur maximale MeanValue = Valeur moyenne MinimumValue = Valeur minimale @@ -59,9 +61,11 @@ ModifiedJulian = Julien modifi\ Name = Nom NumberOfValues = Nombre de valeurs NumberOfNaN = Nombre de \u2018NaN\u2019 +Obligation = Obligation Of_3 = {0} ({1} de {2}) Offset = D\u00e9calage OperatingSystem = Syst\u00e8me d'exploitation +Optional = Optionnel Options = Options Others = Autres OtherSurface = Autre surface Modified: sis/trunk/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1578181&r1=1578180&r2=1578181&view=diff ============================================================================== --- sis/trunk/pom.xml (original) +++ sis/trunk/pom.xml Sun Mar 16 23:30:17 2014 @@ -443,7 +443,7 @@ Apache SIS is a free software, Java lang <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> <!-- TODO: Remove after parent pom.xml has upgraded. --> + <version>2.17</version> <!-- TODO: Remove after parent pom.xml has upgraded. --> <configuration> <includes> <include>**/*TestSuite.java</include> @@ -742,7 +742,7 @@ Apache SIS is a free software, Java lang <!-- Unit tests report --> <plugin> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.16</version> + <version>2.17</version> <reportSets> <!-- Workaround for http://jira.codehaus.org/browse/SUREFIRE-257 --> <reportSet> <reports>
