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

Merge master in #55 #66

Merged
merged 48 commits into from
Oct 7, 2022
Merged

Conversation

FelixStege
Copy link
Contributor

No description provided.

fabian.wuellhorst and others added 30 commits September 14, 2021 09:14
Add boolean is_min to define if the value is a min or max bound. Remove minus for setting min of FMU_API.
…FMUs using multiprocessing. Instance attributes won't work, sadly.
# Conflicts:
#	examples/e2_fmu_example.py
takes the type of the vaiable and stets the bound value to this type
min/max of class Variable were always set to type float
@FelixStege FelixStege self-assigned this Sep 19, 2022
@@ -5,6 +5,8 @@
much more user-friendly than the provided APIs by Dymola or fmpy.
Copy link

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring. Therefore master changes (50057aa to 878edea) implementet manually in branch #55 before merge. In merge the file in branch #55 is selected.

@@ -7,6 +7,7 @@
import pathlib
Copy link

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring. Therefore master changes (50057aa to 878edea) implementet manually in branch #55 before merge. In merge the file in branch #55 is selected.

@@ -7,13 +7,17 @@
import atexit
Copy link

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring. Therefore master changes (50057aa to 878edea) implementet manually in branch #55 before merge. In merge the file in branch #55 is selected.

@@ -143,12 +143,15 @@ def main(

if with_plot:
plt.show()
# Save the data for later reproduction
Copy link

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring. Therefore master changes (50057aa to 878edea) implementet manually in branch #55 before merge. In merge the file in branch #55 is selected.

@@ -48,7 +48,6 @@ def main(
show_window=True,
Copy link

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring. Therefore master changes (50057aa to 878edea) implementet manually in branch #55 before merge. In merge the file in branch #55 is selected.

@@ -8,10 +8,48 @@
import shutil
Copy link

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring. Therefore master changes (50057aa to 878edea) implementet manually in branch #55 before merge. In merge the file in branch #55 is selected.

Copy link

@KBeeser KBeeser left a comment

Choose a reason for hiding this comment

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

Major merge conflict due to refactoring.
Therefore master changes (50057aa to 878edea) implemented manually in branch #55 before merge for the following files:

ebcpy/simulationapi/init.py
ebcpy/simulationapi/dymola.py
ebcpy/simulationapi/fmu.py
examples/e2a_fmu_continuous_example.py
examples/e3_dymola_example.py
tests/test_simulationapi.py

In merge the according files from branch #55 are selected.

@KBeeser KBeeser marked this pull request as ready for review October 7, 2022 08:58
@KBeeser KBeeser merged commit 7d0d605 into 55-restructure-simulation-api-for-do_step Oct 7, 2022
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.

5 participants