Skip to content
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

Jump to bottom

Implementation of UnitsRouter and ComplexUnitConverter. #30

Merged
merged 202 commits into from
Jun 17, 2020
Merged

Implementation of UnitsRouter and ComplexUnitConverter. #30

merged 202 commits into from
Jun 17, 2020

Conversation

younies
Copy link
Collaborator

@younies younies commented Mar 17, 2020 •
edited by hugovdm
Loading

This PR builds on #21 and #42.

Status:

  • getUnitsData is currently broken (due to getConversionRatesInfo change).
Checklist

younies and others added 30 commits July 30, 2019 11:27
@younies
Merge remote-tracking branch 'upstream/master'
21be154
@younies
Merge branch 'master' of github.com:younies/icu
61d2d4c
@younies
Merge branch 'master' of https://github.com/unicode-org/icu
474ea9c
@younies
setup the sync function
c0aa588
@younies
Merge remote-tracking branch 'sffc/units-staging' into units
ba22845
@younies
Create constants enumeration and fix the skeleton of the data
c9b326d
@younies
fix style in unitconverter .cpp and .h
acb44c1
@younies
extract the factor
cb50049
@younies
mile stone
5497606
@younies
Merge remote-tracking branch 'sffc/units-staging' into units
4f20277
@younies
create addSingleFactorConstant function
b0fb1f0
@younies
create unit conversion API
fa87668
Merge branch 'master' of github.com:unicode-org/icu
58cf348
Merge branch 'units' of github.com:younies/icu into units
3798e59
extract Factor
057dee9
implement convert function
d01bcba
implement convert function2
2dc0dca
still under progress: UnitConverter()
4ae2719
still under progress: UnitConverter() 2
d12ac76
@younies
adjust test skeleton
80bdd6c
@younies
add more test cases
83aab46
Merge branch 'units-staging' of github.com:sffc/icu into units
811fecc
@younies
add essential functionality to DecNum
990f019
@younies
add essential functionality to DecNum and fix the skeleton
d7b5882
@younies
add essential functionality to number_decnum, intltest and unit_conve…
d95331c 
…rter
@younies
fix UnitConveter convert function
20d7d67
@younies
add the data needed to perform conversions
6ee3a9c
@younies
add more functionality to Factor
dd76af3
@younies
implement first conversion phase
bc4659e
@younies
add the constants
b45722f
@younies younies requested a review from sffc June 16, 2020 19:06
sffc
sffc requested changes Jun 16, 2020
View reviewed changes
icu4c/source/i18n/measunit_extra.cpp Outdated Show resolved Hide resolved
icu4c/source/i18n/measunit_extra.cpp Outdated Show resolved Hide resolved
@younies younies requested a review from sffc June 16, 2020 20:54
sffc
sffc approved these changes Jun 16, 2020
View reviewed changes
Copy link
Owner

@sffc sffc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. After @hugovdm resolves his open comments, and the tests come back passing, I think we can merge this.

@hugovdm
Copy link
Collaborator

hugovdm commented Jun 17, 2020

I see no more open conversations at this time. Approving.
We'll have another review pass or further improvements anyway!

@younies younies merged commit 1ae7190 into sffc:units-staging Jun 17, 2020
@younies younies deleted the units_router branch June 17, 2020 16:46
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Jul 15, 2020
@younies @hugovdm
PR: sffc#30
ce731d3 
Commit: 1ae7190

Implementation of UnitsRouter and ComplexUnitConverter.

fix MeasureUnit::simplify method
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Jul 23, 2020
@younies @hugovdm
PR: sffc#30
8cf251f 
Commit: 1ae7190

Implementation of UnitsRouter and ComplexUnitConverter.
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Jul 23, 2020
@younies @hugovdm
PR: sffc#30
5266f5e 
Commit: 1ae7190

Implementation of UnitsRouter and ComplexUnitConverter.
hugovdm added a commit to hugovdm/icu that referenced this pull request Jul 23, 2020
@hugovdm
fixup! PR: sffc#30
8bcad0a
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Jul 23, 2020
@younies @hugovdm
PR: sffc#30
59d5d5d 
Commit: 1ae7190

Implementation of UnitsRouter and ComplexUnitConverter.
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Aug 3, 2020
@younies @hugovdm
Implementation of UnitsRouter and ComplexUnitConverter.
41062a1 
PR: sffc#30
Commit: 1ae7190
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Aug 3, 2020
@younies @hugovdm
Implementation of UnitsRouter and ComplexUnitConverter.
400c306 
PR: sffc#30
Commit: 1ae7190
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Aug 15, 2020
@younies @hugovdm
Implementation of UnitsRouter and ComplexUnitConverter.
94e2926 
PR: sffc#30
Commit: 1ae7190
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Aug 28, 2020
@younies @hugovdm
Implementation of UnitsRouter and ComplexUnitConverter.
4ec7869 
PR: sffc#30
Commit: 1ae7190
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Sep 1, 2020
@younies @hugovdm
ICU-20568 Implementation of UnitsRouter and ComplexUnitConverter.
2765759 
PR: sffc#30
Commit: 1ae7190
hugovdm added a commit to icu-units/icu that referenced this pull request Sep 2, 2020
@hugovdm
Remove MeasureUnit simplify() function declaration, cruft from sffc#30
e5d5095 
sffc#30

For hugovdm_upstreaming:
fixup! ICU-20568 Implementation of UnitsRouter and ComplexUnitConverter.
hugovdm added a commit to hugovdm/icu that referenced this pull request Sep 2, 2020
@hugovdm
squash! ICU-20568 Implementation of UnitsRouter and ComplexUnitConver…
a9ce3ec 
…ter.

Remove MeasureUnit simplify() function declaration, cruft from sffc#30

sffc#30
hugovdm added a commit to icu-units/icu that referenced this pull request Sep 2, 2020
@hugovdm
squash! Remove MeasureUnit simplify() function declaration, cruft from …
bb8eb1d 
…sffc#30
hugovdm added a commit to icu-units/icu that referenced this pull request Sep 2, 2020
@hugovdm
squash! Remove MeasureUnit simplify() function declaration, cruft from …
8c0ac1e 
…sffc#30

Unused functions: MeasureUnit::simplify() and appendAndMergeImpl().

Upstream:
squash! ICU-20568 Implementation of UnitsRouter and ComplexUnitConverter.
hugovdm added a commit to icu-units/icu that referenced this pull request Sep 2, 2020
@hugovdm
Remove MeasureUnit::simplify(), cruft from sffc#30
5ab8d81 
sffc#30

Also removes MeasureUnit::appendAndMergeImpl().

Upstream:
squash! ICU-20568 Implementation of UnitsRouter and ComplexUnitConverter.
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Sep 2, 2020
@younies @hugovdm
ICU-20568 Implementation of UnitsRouter and ComplexUnitConverter.
85b588b 
PR: sffc#30
Commit: 1ae7190

SQUASHED FIXES:
icu-units@5ab8d81
Remove MeasureUnit::simplify() and appendAndMergeImpl().
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Sep 2, 2020
@younies @hugovdm
ICU-20568 Implementation of UnitsRouter and ComplexUnitConverter.
ca38844 
PR: sffc#30
Commit: 1ae7190

SQUASHED FIXES:
icu-units@5ab8d81
Remove MeasureUnit::simplify() and appendAndMergeImpl().
hugovdm pushed a commit to hugovdm/icu that referenced this pull request Sep 9, 2020
@younies @hugovdm
ICU-20568 UnitsRouter, ComplexUnitConverter, numberformatter.h
d4e2afc 
add usage to number formatter settings header
PR: sffc#23
Commit: 6d78a95

Implementation of UnitsRouter and ComplexUnitConverter.
PR: sffc#30
Commit: 1ae7190
hugovdm pushed a commit to unicode-org/icu that referenced this pull request Sep 10, 2020
@younies @hugovdm
ICU-20568 UnitsRouter, ComplexUnitConverter, numberformatter.h
72056d4 
add usage to number formatter settings header
PR: sffc#23
Commit: 6d78a95

Implementation of UnitsRouter and ComplexUnitConverter.
PR: sffc#30
Commit: 1ae7190
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hugovdm hugovdm hugovdm approved these changes

@sffc sffc sffc approved these changes

Assignees

@younies younies

@hugovdm hugovdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@younies @sffc @hugovdm