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.

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
merged 133 commits into from
Jun 23, 2023
Merged

Reintegrate OSMOSES into develop #2045

merged 133 commits into from
Jun 23, 2023

Conversation

msevestre
Copy link
Member

No description provided.

rwmcintosh and others added 30 commits November 28, 2022 12:55
* 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>
* Fixes #1748 output mapping wrong namespace

* Fixes #1748 output mapping wrong namespace
* 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"
* Fixes #791 Crash when simulation doesn't have results

* add a test
* 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)
#1784)

* Fixes #1783 Crash when exporting population simulation pk analyses to csv

* update test
* initial implementation

* code review change

* test corrected
* adding interface member

* correcting initialization

* adding clear to outputMappings
* grouping fixed in code

* adding comment
rwmcintosh and others added 22 commits April 28, 2023 12:06
… not work as expected (#1996)

* Add tests to reproduce the bug

* Fixes #1995 setting the value should also create the formula underneath

* Fixes #1995. Setting a value for discrete resets the percentile
…1998)

* Fixes #1997 Building blocks of cloned module do not have parent module set

* add a test
# 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
* Renamed molecule start values to initial conditions

* renamed parameter start values

* rename some variables

* PR feedback

* PR feedback
* Fixes #2002 Remove StartValueBase and IStartValue temporary code

* Remove StartValueBuildingBlock abstractions

* Remove StartValue abstractions in xml serializers

* PR feedback
…2007)

* Fixes #2006 Require that applications specify their local directory

* spacing

* adding the null case

* null check
#2009)

* Fixes #2008 Double-click on a module opens "Add building blocks" dialogue

* pr feedback
* Fixes Create building blocks with default names

* add some tests
#2018)

* Fixes #2017 Move Initial Conditions relating to an expression profile into the expression profile object

* Add removeInitialCondition

* PR feedback

* PR feedback
#2027)

* Fixes #2022 Add common interface to indicate a building block contains initial conditions

* PR feedback

* PR feedback

* PR feedback
…2031)

* Fixes #2030 Weird "differences" when applying an expression profile

* PR feedback
#2029)

* Fixes #2028 "Initial concentration" overwritten to 0 when creating a simulation from module from PK-Sim 11.2

* comment and test
…ock (#2042)

* Fixes #2041 Create initial conditions for ExpressionProfileBuildingBlock

* PR feedback
@msevestre msevestre requested review from rwmcintosh and Yuri05 June 23, 2023 14:25
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)'
Copy link
Member Author

Choose a reason for hiding this comment

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

we should undo this

Copy link
Member

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

@msevestre msevestre merged commit 3c18ced into develop Jun 23, 2023
@msevestre msevestre deleted the OSMOSES branch June 23, 2023 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants