You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sis.apache.org by de...@apache.org on 2018/08/06 12:10:10 UTC

[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 11d4e97d3ee0bc7d6afe5f081ac43081530eda1d
Merge: d281917 c028527
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Aug 6 14:06:06 2018 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1.

 .../operation/transform/TransferFunction.java      |  68 +++-
 .../operation/transform/TransferFunctionTest.java  |  39 +-
 .../main/java/org/apache/sis/math/Fraction.java    |  66 +++-
 .../org/apache/sis/measure/AbstractConverter.java  |  22 +-
 .../java/org/apache/sis/measure/AbstractUnit.java  |  54 +--
 .../org/apache/sis/measure/ConventionalUnit.java   | 105 ++----
 .../org/apache/sis/measure/LinearConverter.java    |  58 +--
 .../main/java/org/apache/sis/measure/Prefixes.java | 216 +++++++++++
 .../java/org/apache/sis/measure/SystemUnit.java    | 165 ++++++--
 .../java/org/apache/sis/measure/UnitDimension.java |  44 ++-
 .../java/org/apache/sis/measure/UnitFormat.java    | 420 +++++++++++++--------
 .../main/java/org/apache/sis/measure/Units.java    |  24 +-
 .../java/org/apache/sis/math/FractionTest.java     |  27 ++
 .../apache/sis/measure/ConventionalUnitTest.java   |  90 ++---
 .../apache/sis/measure/LinearConverterTest.java    |  39 +-
 .../java/org/apache/sis/measure/PrefixesTest.java  | 143 +++++++
 .../org/apache/sis/measure/UnitFormatTest.java     | 139 ++++++-
 .../java/org/apache/sis/measure/UnitsTest.java     |   4 +-
 .../apache/sis/test/suite/UtilityTestSuite.java    |   1 +
 19 files changed, 1250 insertions(+), 474 deletions(-)