diff options
23 files changed, 36 insertions, 12 deletions
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8445b6b..db24ee7 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/CHANGELOG.org b/CHANGELOG.org index 77e7593..1a49709 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -1,7 +1,20 @@ * Changelog All notable changes in this project will be shown in this file. +** Unreleased +*** Added + - Added a simple unit conversion method to the Unit interface + - Added a static factory to create nonlinear units to the Unit interface +*** Changed + - You can now use tabs or spaces to separate unit names and their definitions in unit files. ** v0.2.0 - [2019-04-14] +*** Added + - A selection-based unit converter which allows you to select two units, input a value, and convert. + - The UnitDatabase now stores dimensions. + - A system to parse mathematical expressions, used to parse unit expressions. + - You can now add and subtract in unit expressions! + - Instructions for obtaining unit instances are provided in the relevant classes + - The UnitPrefix interface now provides default times, dividedBy and toExponent methods. *** Changed - When searching for units, units with no prefixes are searched for before prefixed units - Smaller prefixes are searched for before larger prefixes @@ -10,13 +23,6 @@ All notable changes in this project will be shown in this file. - BaseUnit is now a subclass of LinearUnit - In unit files, Comments can now start in the middle of lines - UnitsDatabase.addAllFromFile() has been renamed to loadUnitsFile() -*** Added - - A selection-based unit converter which allows you to select two units, input a value, and convert. - - The UnitDatabase now stores dimensions. - - A system to parse mathematical expressions, used to parse unit expressions. - - You can now add and subtract in unit expressions! - - Instructions for obtaining unit instances are provided in the relevant classes - - The UnitPrefix interface now provides default times, dividedBy and toExponent methods. ** v0.1.0 - [2019-02-01] NOTE: At this stage, the API is subject to significant change. *** Added diff --git a/src/org/unitConverter/UnitsDatabase.java b/src/org/unitConverter/UnitsDatabase.java index 37d53d4..dcc98df 100755..100644 --- a/src/org/unitConverter/UnitsDatabase.java +++ b/src/org/unitConverter/UnitsDatabase.java @@ -36,6 +36,8 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.unitConverter.dimension.UnitDimension; import org.unitConverter.math.DecimalComparison; @@ -972,6 +974,11 @@ public final class UnitsDatabase { } /** + * A regular expression that separates names and expressions in unit files. + */ + private static final Pattern NAME_EXPRESSION = Pattern.compile("(\\S+)\\s+(\\S.*)"); + + /** * The exponent operator * * @param base @@ -1200,13 +1207,22 @@ public final class UnitsDatabase { } // divide line into name and expression - final String[] parts = line.split("\t"); - if (parts.length < 2) + final Matcher lineMatcher = NAME_EXPRESSION.matcher(line); + if (!lineMatcher.matches()) throw new IllegalArgumentException(String.format( - "Lines must consist of a unit name and its definition, separated by tab(s) (line %d).", + "Error at line %d: Lines of a unit file must consist of a unit name, then spaces or tabs, then a unit expression.", lineCounter)); - final String name = parts[0]; - final String expression = parts[parts.length - 1]; + final String name = lineMatcher.group(1); + final String expression = lineMatcher.group(2); + + // divide line into name and expression + // final String[] parts = line.split("\t"); + // if (parts.length < 2) + // throw new IllegalArgumentException(String.format( + // "Lines must consist of a unit name and its definition, separated by tab(s) (line %d).", + // lineCounter)); + // final String name = parts[0]; + // final String expression = parts[parts.length - 1]; if (name.endsWith(" ")) { System.err.printf("Warning - line %d's unit name ends in a space", lineCounter); diff --git a/src/org/unitConverter/converterGUI/DelegateListModel.java b/src/org/unitConverter/converterGUI/DelegateListModel.java index b80f63d..b80f63d 100755..100644 --- a/src/org/unitConverter/converterGUI/DelegateListModel.java +++ b/src/org/unitConverter/converterGUI/DelegateListModel.java diff --git a/src/org/unitConverter/converterGUI/FilterComparator.java b/src/org/unitConverter/converterGUI/FilterComparator.java index 7b17bfc..7b17bfc 100755..100644 --- a/src/org/unitConverter/converterGUI/FilterComparator.java +++ b/src/org/unitConverter/converterGUI/FilterComparator.java diff --git a/src/org/unitConverter/converterGUI/GridBagBuilder.java b/src/org/unitConverter/converterGUI/GridBagBuilder.java index f1229b2..f1229b2 100755..100644 --- a/src/org/unitConverter/converterGUI/GridBagBuilder.java +++ b/src/org/unitConverter/converterGUI/GridBagBuilder.java diff --git a/src/org/unitConverter/converterGUI/UnitConverterGUI.java b/src/org/unitConverter/converterGUI/UnitConverterGUI.java index 2d3d1a5..2d3d1a5 100755..100644 --- a/src/org/unitConverter/converterGUI/UnitConverterGUI.java +++ b/src/org/unitConverter/converterGUI/UnitConverterGUI.java diff --git a/src/org/unitConverter/dimension/BaseDimension.java b/src/org/unitConverter/dimension/BaseDimension.java index 5e3ddad..5e3ddad 100755..100644 --- a/src/org/unitConverter/dimension/BaseDimension.java +++ b/src/org/unitConverter/dimension/BaseDimension.java diff --git a/src/org/unitConverter/dimension/OtherBaseDimension.java b/src/org/unitConverter/dimension/OtherBaseDimension.java index 8aea2b9..8aea2b9 100755..100644 --- a/src/org/unitConverter/dimension/OtherBaseDimension.java +++ b/src/org/unitConverter/dimension/OtherBaseDimension.java diff --git a/src/org/unitConverter/dimension/SIBaseDimension.java b/src/org/unitConverter/dimension/SIBaseDimension.java index c459963..c459963 100755..100644 --- a/src/org/unitConverter/dimension/SIBaseDimension.java +++ b/src/org/unitConverter/dimension/SIBaseDimension.java diff --git a/src/org/unitConverter/dimension/StandardDimensions.java b/src/org/unitConverter/dimension/StandardDimensions.java index 4b1b814..4b1b814 100755..100644 --- a/src/org/unitConverter/dimension/StandardDimensions.java +++ b/src/org/unitConverter/dimension/StandardDimensions.java diff --git a/src/org/unitConverter/dimension/UnitDimension.java b/src/org/unitConverter/dimension/UnitDimension.java index dbeaeff..dbeaeff 100755..100644 --- a/src/org/unitConverter/dimension/UnitDimension.java +++ b/src/org/unitConverter/dimension/UnitDimension.java diff --git a/src/org/unitConverter/dimension/package-info.java b/src/org/unitConverter/dimension/package-info.java index 8cb26b1..8cb26b1 100755..100644 --- a/src/org/unitConverter/dimension/package-info.java +++ b/src/org/unitConverter/dimension/package-info.java diff --git a/src/org/unitConverter/unit/BaseUnit.java b/src/org/unitConverter/unit/BaseUnit.java index 67309cf..67309cf 100755..100644 --- a/src/org/unitConverter/unit/BaseUnit.java +++ b/src/org/unitConverter/unit/BaseUnit.java diff --git a/src/org/unitConverter/unit/DefaultUnitPrefix.java b/src/org/unitConverter/unit/DefaultUnitPrefix.java index 4a9e487..4a9e487 100755..100644 --- a/src/org/unitConverter/unit/DefaultUnitPrefix.java +++ b/src/org/unitConverter/unit/DefaultUnitPrefix.java diff --git a/src/org/unitConverter/unit/NonlinearUnits.java b/src/org/unitConverter/unit/NonlinearUnits.java index eda4a74..eda4a74 100755..100644 --- a/src/org/unitConverter/unit/NonlinearUnits.java +++ b/src/org/unitConverter/unit/NonlinearUnits.java diff --git a/src/org/unitConverter/unit/SIPrefix.java b/src/org/unitConverter/unit/SIPrefix.java index 31d7ff2..31d7ff2 100755..100644 --- a/src/org/unitConverter/unit/SIPrefix.java +++ b/src/org/unitConverter/unit/SIPrefix.java diff --git a/src/org/unitConverter/unit/Unit.java b/src/org/unitConverter/unit/Unit.java index 54f0ab5..54f0ab5 100755..100644 --- a/src/org/unitConverter/unit/Unit.java +++ b/src/org/unitConverter/unit/Unit.java diff --git a/src/org/unitConverter/unit/UnitPrefix.java b/src/org/unitConverter/unit/UnitPrefix.java index 9f9645d..9f9645d 100755..100644 --- a/src/org/unitConverter/unit/UnitPrefix.java +++ b/src/org/unitConverter/unit/UnitPrefix.java diff --git a/src/org/unitConverter/unit/UnitSystem.java b/src/org/unitConverter/unit/UnitSystem.java index 550eff6..550eff6 100755..100644 --- a/src/org/unitConverter/unit/UnitSystem.java +++ b/src/org/unitConverter/unit/UnitSystem.java diff --git a/src/test/java/UnitDimensionTest.java b/src/test/java/UnitDimensionTest.java index 587cf4c..587cf4c 100755..100644 --- a/src/test/java/UnitDimensionTest.java +++ b/src/test/java/UnitDimensionTest.java diff --git a/src/test/java/UnitTest.java b/src/test/java/UnitTest.java index 7a3f29d..7a3f29d 100755..100644 --- a/src/test/java/UnitTest.java +++ b/src/test/java/UnitTest.java diff --git a/unitsfile.txt b/unitsfile.txt index bda9b81..bda9b81 100755..100644 --- a/unitsfile.txt +++ b/unitsfile.txt |