-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Reintegrate OSMOSES into develop #2045
Merged
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
* 1749 default scaling when changing output * Revert "1749 default scaling when changing output" This reverts commit 584d5ab. * 1749 default scaling when changing output Signed-off-by: georgeDaskalakis <37107428+georgeDaskalakis@users.noreply.github.com> * add missing space Signed-off-by: georgeDaskalakis <37107428+georgeDaskalakis@users.noreply.github.com> Co-authored-by: Michael Sevestre <michael@design2code.ca>
* 1749 default scaling when changing output * Revert "1749 default scaling when changing output" This reverts commit 584d5ab. * initial implementation * correcting test
* 1749 default scaling when changing output * Revert "1749 default scaling when changing output" This reverts commit 584d5ab. * 1752 fixed * correcting unit test * corrections
* correcting build * exception fixed
* Ensure that WeightedObservedData is also in domain * Fixes #1772 ensure that output mapping are exported * Fixes tests * Fixes tests also that was hard coding number of pk parameters"
* duplicate deviation lines fixed * correcting tests * Update PredictedVsObservedChartService.cs Co-authored-by: Michael Sevestre <michael@design2code.ca>
…or naming, and remove hard core query in a loop (#1776)
* initial implementation * code review change * test corrected
* adding interface member * correcting initialization * adding clear to outputMappings
* grouping fixed in code * adding comment
# Conflicts: # src/OSPSuite.Assets/UIConstants.cs # src/OSPSuite.Infrastructure.Import/Core/DataFormat/AbstractColumnsDataFormat.cs # src/OSPSuite.Infrastructure.Import/Core/DataSource.cs # src/OSPSuite.Infrastructure.Import/Core/DataSourceFileReaders/ExcelDataSourceFile.cs # src/OSPSuite.Infrastructure.Import/Core/InvalidObservedDataFileException.cs # src/OSPSuite.Infrastructure.Import/Services/Importer.cs # tests/OSPSuite.Infrastructure.Tests/Import/DataSourceSpecs.cs
* Fixes #2002 Remove StartValueBase and IStartValue temporary code * Remove StartValueBuildingBlock abstractions * Remove StartValue abstractions in xml serializers * PR feedback
…tions folders (#2039)
msevestre
commented
Jun 23, 2023
appveyor.yml
Outdated
assembly_version: '$(ospsuite_version).$(build_number)' | ||
file_version: '$(ospsuite_version).$(build_number)' | ||
informational_version: '$(ospsuite_version).$(build_number)' | ||
version: '12.0.$(build_number)' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should undo this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we don't need any of these changes in appveyor.yml, just bump the environment var
rwmcintosh
approved these changes
Jun 23, 2023
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.
No description provided.