Fixes #1949 data importer parsing unit should be case insensitive #1952
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
msevestre
commented
Apr 2, 2023
msevestre
commented
Apr 2, 2023
| @@ -76,7 +75,7 @@ private void setDimensionsForMappings(ColumnInfoCache columnInfos) | |||
| else | |||
| { | |||
| var supportedDimensions = concreteColumnInfo.SupportedDimensions; | |||
| var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.HasUnit(mappedColumn.Unit.SelectedUnit)); | |||
| var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.SupportsUnit(mappedColumn.Unit.SelectedUnit, ignoreCase: true)); | |||
There was a problem hiding this comment.
this is the one change that did not impact my failing test but should be done I believe?
| @@ -159,7 +158,12 @@ public UnitDescription ExtractUnitDescriptions(string description, IReadOnlyList | |||
|
|
|||
| protected string ValidateUnit(string unit, IReadOnlyList<IDimension> supportedDimensions) | |||
| { | |||
| return supportedDimensions.Any(x => x.HasUnit(unit)) ? unit : UnitDescription.InvalidUnit; | |||
| var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.SupportsUnit(unit, ignoreCase: true)); | |||
There was a problem hiding this comment.
this was the one change that was required
| protected override void Context() | ||
| { | ||
| _fakedTimeDimension = A.Fake<IDimension>(); | ||
| _fakedConcentrationDimensionMolar = A.Fake<IDimension>(); | ||
| _fakedConcentrationDimensionMolar = A.Fake<IDimension>(); |
There was a problem hiding this comment.
Why are we faking all the dimensions here? shouldn't we use real dimension instead?
msevestre
commented
Apr 2, 2023
tests/OSPSuite.Presentation.Tests/Importer/Core/DataFormat/DataFormat_MetaData_CSpecs.cs
Show resolved
Hide resolved
|
@msevestre I am removing the remaining .HasUnit and am thinking a bit about how to restructure the functions. Should I commit directly to the PR? |
|
@georgeDaskalakis I don't think we need to refactor RIGHT Now. But this needs refactoring for sure |
georgeDaskalakis
approved these changes
Apr 4, 2023
| @@ -76,7 +75,7 @@ private void setDimensionsForMappings(ColumnInfoCache columnInfos) | |||
| else | |||
| { | |||
| var supportedDimensions = concreteColumnInfo.SupportedDimensions; | |||
| var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.HasUnit(mappedColumn.Unit.SelectedUnit)); | |||
| var dimensionForUnit = supportedDimensions.FirstOrDefault(x => x.SupportsUnit(mappedColumn.Unit.SelectedUnit, ignoreCase: true)); | |||
tests/OSPSuite.Presentation.Tests/Importer/Core/DataFormat/DataFormat_MetaData_CSpecs.cs
Show resolved
Hide resolved
rwmcintosh
added a commit
that referenced
this pull request
Feb 14, 2024
* 1886 importer unit for fraction not recognized (#1892) * changing the check * correction to get the first non empty unit * cleaning up * Fixes #1925 (#1926) @Yuri05 Merging. NEed to test in the app * Fixes #1925 (#1927) * 2566 fixed (#1932) * nunit adapter updated (#1938) * Fixes #1379 (#1948) * Fixes #1946 mobi cannot handler observed data sets with only 1 point (#1947) * Fixes #1949 data importer parsing unit should be case insensitive (#1952) * Fixes #1949 data importer parsing unit should be case insensitive * Run resharper * Remove fake to use real dimensions * Remove fake to use real dimensions * refactoring and removing further .HasUnit() calls --------- Co-authored-by: georgeDaskalakis <37107428+georgeDaskalakis@users.noreply.github.com> * preventing exception (#1957) * templates changed (#1962) --------- Co-authored-by: georgeDaskalakis <37107428+georgeDaskalakis@users.noreply.github.com> Co-authored-by: Michael Sevestre <michael@design2code.ca>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@georgeDaskalakis The function hasUnit should not be used as it checked for actual value by keys. The code should always use SupportUnits In my opinion
I found a section that still uses hasUnit. The code is too complicated for me to review or change at this stage so I will ask you to do the modifications if required.
I really think the code in those functions (
validateUnitsSupportedAndSameDimensionorvalidateErrorAgainstMeasurementetc) is very complicated. We should extract some of the logic regarding error mapping, finding units etc...we repeat almost the same code throughout the Datasource file and this makes modification much harder than they should