New units #1379

melissalinkert · 2014-10-20T23:53:06Z

This is gh-1265, with four extra commits for cleaning up old jars and making tests pass.

This is not currently in the breaking queue, so the merge jobs should be checked for passing status.

Some of the units that cause problems are currently commented out.

Only part compiles so far.

This does not work however due to a bug in uomo: https://bugs.eclipse.org/bugs/show_bug.cgi?id=422300

This wrappers is as light as possible and not functional at present. It does allow `ant clean compile-ome-xml` to build successfully. While it uses uomo it could be changed another by hopefully just changing the ome.units.* files and language.py in xsdfu. The OMEXMLModelEnumHandler.template will need a little bit more work.

While the code compiles the underlying units classes are still missing most of the implementation. This may however be enough to allow all the changes to start to be made to the main codebase as the types are hopefully correct.

These are not convertible to/from the other temperature units as they have a time component.

There is no need to subclass Number, since the PrimitiveNumber's value is a Number.

melissalinkert · 2014-10-22T01:01:14Z

Last two commits fix BIOFORMATS-5.1-breaking-matlab.

jburel · 2014-10-22T11:12:13Z

This and ome/openmicroscopy#3129 are now out of the breaking queue

jburel · 2014-10-22T13:49:33Z

re-adding breaking label so we can test new infrastructure (mainly upgrade scripts)

qidane · 2014-10-23T12:56:43Z

Example of the issue we will hit if it is not derived from Number:
qidane/bioformats@melissalinkert:new-units...new-units-more-types

First commit shown what will happen as we work on lengths which use the types derived from PrimitiveNumber, in this case PositiveFloat. Second two commits revert the changes to allow the code to compile.

qidane · 2014-10-23T13:08:01Z

I also noticed a bug in the OMEXMLModelEnumHandler.template but I will make a PR with that fix in it after the Number issue is resolved.

Rework the way Number is handle in the Units

qidane · 2014-10-23T16:21:45Z

This also resolved the issue with OMEXMLModelEnumHandler.template.

jburel · 2014-10-24T14:50:16Z

both @melissalinkert and @qidane are happy with current state of the PR, removing the breaking label

Stop Time from having null value

mtbc · 2014-10-27T19:48:23Z

Travis failure.

melissalinkert · 2014-10-27T20:37:41Z

Restarted.

joshmoore · 2014-10-28T08:15:19Z

components/ome-xml/src/ome/units/UNITS.java

+  public static final ome.units.unit.Unit<ElectricPotential> VOLT    = ome.units.unit.Unit.<ElectricPotential>CreateBaseUnit("SI.VOLT", "V");
+  public static final ome.units.unit.Unit<Frequency>         HERTZ   = ome.units.unit.Unit.<Frequency>CreateBaseUnit("SI.HERTZ", "Hz");
+  public static final ome.units.unit.Unit<Length>            METRE   = ome.units.unit.Unit.<Length>CreateBaseUnit("SI.METRE", "m");
+  public static final ome.units.unit.Unit<Length>            INCH    = ome.units.unit.Unit.<Length>CreateBaseUnit("Imperial.INCH", "");


Isn't this missing a symbol, @qidane?

Fixed: melissalinkert#19

jburel · 2014-10-28T11:55:37Z

Discussed with @qidane, happy to have it merged

sbesson · 2014-10-28T12:14:31Z

Thanks all. Merging.

New units

qidane added 30 commits July 23, 2014 15:59

Schema moving from 2013-10-dev-3 to 2013-10-dev-4

7127304

Remove version number from catalog filename

a86ddf1

Sample changes for discussion - with full units

4030935

Use new units and get to compile

cc14527

Some of the units that cause problems are currently commented out.

Adding unit to attributes in ome.xsd

cd817c6

Initial approach to marking Units Enums

f51d59b

Add special substitution for units enums

3ee2ad9

Add case sensitive compare to unit constructors

baaa4aa

Part way through removing xxxUnit functions

39fa8e6

Adding debug markers to templates

9cb8691

Stop Unit function generation for Metadata files

cc6945e

Tidy up markers

1dde2a1

Initial changes to use unitsofmeasurement library

fb192e5

Only part compiles so far.

Adding initial enum changes

1067547

Changes to in theory allow: ant compile-ome-xml

0c476dc

This does not work however due to a bug in uomo: https://bugs.eclipse.org/bugs/show_bug.cgi?id=422300

Initial adding of jscience code

d37153d

Changes to allow: ant clean jar-specification

bba4303

While the code compiles the underlying units classes are still missing most of the implementation. This may however be enough to allow all the changes to start to be made to the main codebase as the types are hopefully correct.

Change SI to UNITS and add to enum template

8f9deb4

More changes to define our system of units

2457786

Compiling system of units.

bd80afa

Temperature: remove accumulated thermal units ATU

31d26ec

These are not convertible to/from the other temperature units as they have a time component.

Initial unit unit tests - not passing yet

8e55c0b

Just make some test pass and comment out rest

79fe53f

Remove pressure unit usage

0a0ddb6

Remove temperature unit usage

873e745

Remove voltage unit usage

78f4543

Remove frequency unit usage

f35715f

Remove power unit usage

81513ef

Remove time unit usage

d22d385

melissalinkert added the develop label Oct 20, 2014

sbesson added the breaking label Oct 21, 2014

melissalinkert added 2 commits October 21, 2014 10:54

Fix PrimitiveNumber to subclass PrimitiveType

beaeaf9

There is no need to subclass Number, since the PrimitiveNumber's value is a Number.

PrimitiveNumber: do not unnecessarily override the superclass

33ff423

jburel removed the breaking label Oct 22, 2014

jburel mentioned this pull request Oct 22, 2014

Dsl units ome/openmicroscopy#3129

Closed

jburel added the breaking label Oct 22, 2014

qidane and others added 2 commits October 23, 2014 16:44

Rework the way Number is handle in the Units

0b1d6cd

Merge pull request #17 from qidane/new-units

88908b6

Rework the way Number is handle in the Units

jburel removed the breaking label Oct 24, 2014

qidane and others added 3 commits October 27, 2014 11:48

Prohibit null value in Time quantity

f79ac5d

Protect Time creation with null value in formats

3f0146f

Merge pull request #18 from qidane/new-units

e4d131d

Stop Time from having null value

joshmoore reviewed Oct 28, 2014
View reviewed changes

sbesson added a commit that referenced this pull request Oct 28, 2014

Merge pull request #1379 from melissalinkert/new-units

db0603a

New units

sbesson merged commit db0603a into ome:develop Oct 28, 2014

sbesson added this to the 5.1.0-m2 milestone Nov 26, 2014

melissalinkert deleted the new-units branch April 13, 2015 18:03

sbesson mentioned this pull request Nov 10, 2023

Update license headers for all Java sources of the OME-XML library ome/ome-model#181

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New units #1379

New units #1379

melissalinkert commented Oct 20, 2014

melissalinkert commented Oct 22, 2014

jburel commented Oct 22, 2014

jburel commented Oct 22, 2014

qidane commented Oct 23, 2014

qidane commented Oct 23, 2014

qidane commented Oct 23, 2014

jburel commented Oct 24, 2014

mtbc commented Oct 27, 2014

melissalinkert commented Oct 27, 2014

joshmoore Oct 28, 2014

qidane Oct 28, 2014

jburel commented Oct 28, 2014

sbesson commented Oct 28, 2014

New units #1379

New units #1379

Conversation

melissalinkert commented Oct 20, 2014

melissalinkert commented Oct 22, 2014

jburel commented Oct 22, 2014

jburel commented Oct 22, 2014

qidane commented Oct 23, 2014

qidane commented Oct 23, 2014

qidane commented Oct 23, 2014

jburel commented Oct 24, 2014

mtbc commented Oct 27, 2014

melissalinkert commented Oct 27, 2014

joshmoore Oct 28, 2014

Choose a reason for hiding this comment

qidane Oct 28, 2014

Choose a reason for hiding this comment

jburel commented Oct 28, 2014

sbesson commented Oct 28, 2014