Skip to content

UDUNITS cleanup #1610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lesserwhirls merged 5 commits into from
Sep 25, 2026
Merged

UDUNITS cleanup #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f652a1f
Improve udunits grammar to resolve warnings
lesserwhirls Sep 24, 2026
ab50691
Remove test code from the parser class definition
lesserwhirls Sep 24, 2026
d11f812
Remove ex config file
lesserwhirls Sep 24, 2026
5928a1b
Remove udunits VERSION file
lesserwhirls Sep 24, 2026
b14359b
Remove files that are duplicated or no longer needed
lesserwhirls Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions udunits/src/main/java/ucar/units/.exrc
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions udunits/src/main/java/ucar/units/HISTORY
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions udunits/src/main/java/ucar/units/LICENSE
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions udunits/src/main/java/ucar/units/README.html
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion udunits/src/main/java/ucar/units/VERSION
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion udunits/src/main/java/ucar/units/package-list
View file
Open in desktop

This file was deleted.

108 changes: 7 additions & 101 deletions udunits/src/main/javacc/StandardUnitFormat.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 1999, 2009 University Corporation for Atmospheric Research/Unidata
* See file LICENSE for legal details.
* Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
* See LICENSE for license information.
*/

options
Expand Down Expand Up @@ -366,103 +366,6 @@ PARSER_BEGIN(StandardUnitFormat)
prefix = prefixDB.getPrefixBySymbol(string);
return prefix;
}


private static void myAssert(StandardUnitFormat parser, final String spec,
final Unit unit) throws NoSuchUnitException,
UnitParseException, SpecificationException, UnitDBException,
PrefixDBException, UnitSystemException
{
if (!parser.parse(spec).equals(unit)) {
throw new AssertionError(spec + " != " + unit);
}
System.out.println(spec + " -> " + unit);
}


/**
* Test this class.
*/
public static void main(String[] args)
throws Exception
{
StandardUnitFormat parser =
StandardUnitFormat.instance();
final Unit m = parser.parse("m");
final Unit s = parser.parse("s");
final Unit epoch = parser.parse("s @ 1970-01-01 00:00:00 UTC");
myAssert(parser, "m m", m.multiplyBy(m));
myAssert(parser, "m.m", m.multiplyBy(m));
myAssert(parser, "(m)(m)", m.multiplyBy(m));
myAssert(parser, "m/s/s", m.divideBy(s).divideBy(s));
myAssert(parser, "m2", m.raiseTo(2));
myAssert(parser, "m2.s", m.raiseTo(2).multiplyBy(s));
myAssert(parser, "m2/s", m.raiseTo(2).divideBy(s));
myAssert(parser, "m^2/s", m.raiseTo(2).divideBy(s));
myAssert(parser, "m s @ 5", m.multiplyBy(s).shiftTo(5.0));
myAssert(parser, "m2 s @ 5", m.raiseTo(2).multiplyBy(s).shiftTo(5));
myAssert(parser, "m2 s-1 @ 5", m.raiseTo(2).multiplyBy(s.raiseTo(-1))
.shiftTo(5));
myAssert(parser, "m s from 5", m.multiplyBy(s).shiftTo(5));
myAssert(parser, "s@19700101", epoch);
myAssert(parser, "s@19700101T000000", epoch);
myAssert(parser, "s@19700101T000000.00", epoch);
myAssert(parser, "s @ 1970-01-01T00:00:00.00", epoch);
myAssert(parser, "s @ 1970-01-01 00:00:00.00", epoch);
myAssert(parser, "s @ 1970-01-01 00:00:00.00 +0", epoch);
myAssert(parser, "s @ 1970-01-01T00:00:00.00 -12", epoch
.shiftTo(new Date(12 * 60 * 60 * 1000)));
if (!parser.parse("days since 2009-06-14 04:00:00").equals(
parser.parse("days since 2009-06-14 04:00:00 +00:00"))) {
throw new AssertionError();
}
myAssert(parser, "lg(re: 1)", DerivedUnitImpl.DIMENSIONLESS.log(10));
myAssert(parser, "0.1 lg(re 1 mm)", m.multiplyBy(1e-3).log(10)
.multiplyBy(0.1));
myAssert(parser, "m", m);
myAssert(parser, "2 m s", m.multiplyBy(s).multiplyBy(2));
myAssert(parser, "3.14 m.s", m.multiplyBy(s).multiplyBy(3.14));
myAssert(parser, "1e9 (m)", m.multiplyBy(1e9));
myAssert(parser, "(m s)2", m.multiplyBy(s).raiseTo(2));
myAssert(parser, "m2.s-1", m.raiseTo(2).divideBy(s));
myAssert(parser, "m2 s^-1", m.raiseTo(2).divideBy(s));
myAssert(parser, "(m/s)2", m.divideBy(s).raiseTo(2));
myAssert(parser, "m2/s-1", m.raiseTo(2).divideBy(s.raiseTo(-1)));
myAssert(parser, "m2/s^-1", m.raiseTo(2).divideBy(s.raiseTo(-1)));
myAssert(parser, ".5 m/(.25 s)2", m.multiplyBy(.5).divideBy(
s.multiplyBy(.25).raiseTo(2)));
myAssert(parser, "m.m-1.m", m.multiplyBy(m.raiseTo(-1)).multiplyBy(m));
myAssert(parser, "2.0 m 1/2 s-1*(m/s^1)^-1 (1e9 m-1)(1e9 s-1)-1.m/s", m
.multiplyBy(2).multiplyBy(1. / 2.).multiplyBy(
s.raiseTo(-1)).multiplyBy(
m.divideBy(s.raiseTo(1)).raiseTo(-1))
.multiplyBy(m.raiseTo(-1).multiplyBy(1e9)).multiplyBy(
s.raiseTo(-1).multiplyBy(1e9).raiseTo(-1))
.multiplyBy(m).divideBy(s));
myAssert(parser, "m/km", m.divideBy(m.multiplyBy(1e3)));

LineNumberReader lineInput = new LineNumberReader(
new InputStreamReader(System.in));

for (;;)
{
System.out.print("Enter a unit specification or ^D to quit: ");

String spec = lineInput.readLine();
if (spec == null)
break;

try
{
System.out.println(parser.parse(spec.trim()));
}
catch (Exception e)
{
System.out.println(e.getMessage());
}
}
System.out.println("");
}
}

PARSER_END(StandardUnitFormat)
Expand Down Expand Up @@ -560,18 +463,20 @@ Unit productExpr(UnitDB unitDB)
{
unit=powerExpr(unitDB)
(
LOOKAHEAD(2)
(
<DIVIDE>
unit2 = powerExpr(unitDB)
{
unit = unit.divideBy(unit2);
}
|
LOOKAHEAD(2)
[ <PERIOD> | <STAR> | <SP> ]
[ LOOKAHEAD(2) ( <PERIOD> | <STAR> | <SP> ) ]
unit2=powerExpr(unitDB)
{
unit = unit.multiplyBy(unit2);
}
)
)*
{
return unit;
Expand All @@ -592,6 +497,7 @@ Unit powerExpr(UnitDB unitDB)
{
unit=basicExpr(unitDB)
[
LOOKAHEAD(2)
[ <RAISE> ]
exponent=integer()
{
Expand Down
10 changes: 9 additions & 1 deletion udunits/src/test/java/ucar/units/TestUdunits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
* Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
* See LICENSE for license information.
*/

Expand Down Expand Up @@ -310,6 +310,14 @@ public void testStandardUnitFormat() throws Exception {
.multiplyBy(m.raiseTo(-1).multiplyBy(1e9)).multiplyBy(s.raiseTo(-1).multiplyBy(1e9).raiseTo(-1))
.multiplyBy(m).divideBy(s));
myAssert(parser, "m/km", m.divideBy(m.multiplyBy(1e3)));
myAssert(parser, "m+2", m.raiseTo(2));
myAssert(parser, "m^+2", m.raiseTo(2));
myAssert(parser, "m+1 s-2", m.raiseTo(1).multiplyBy(s.raiseTo(-2)));
myAssert(parser, "(m )", m);
myAssert(parser, "(m s )", m.multiplyBy(s));
myAssert(parser, "m s", m.multiplyBy(s));
myAssert(parser, ".5 m", m.multiplyBy(0.5));
myAssert(parser, "m .5 s", m.multiplyBy(0.5).multiplyBy(s));

LineNumberReader lineInput = new LineNumberReader(new InputStreamReader(System.in));

Expand Down
Loading