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

[DRAFT] 55 restructure simulation api for do step #65

Draft
wants to merge 62 commits into
base: master
Choose a base branch
from
Draft

[DRAFT] 55 restructure simulation api for do step #65

Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
40625df
draft of a do_step and an initialisation function for FMU API
Jul 11, 2022
d342c1d
delete results of examples
Jul 11, 2022
46cb807
restore e2_fmu_example.py
Jul 11, 2022
06f7bb4
restore e2_fmu_example.py pt. 2
Jul 11, 2022
abc5b8f
decomposed do_step function into read, write, step
Jul 11, 2022
9cb0dcd
change access of input data-table in do_step function
Jul 13, 2022
9b83aa3
results are an attribut of FMU_API
Jul 13, 2022
8a90c67
in- and output are automatically added to variables to read for resul…
Jul 13, 2022
df15d65
add find_vars functionality from aku FMU handler
Jul 14, 2022
e1e0ba3
clean and document
Jul 14, 2022
afe77c7
re-organize wrapper functions for stepwise FMU simulation
Jul 20, 2022
116f484
example for stepwise fmu simulation
Jul 26, 2022
b630cd0
minor change
Aug 1, 2022
3444270
minor change
Aug 4, 2022
3a2363b
input table is attribute now (used in stepwise fmu simulation)
Aug 4, 2022
28a4069
input table set during instantiation now. clos all function
Aug 4, 2022
bd3064e
input table set at initialization again. This way for next simulation…
Aug 4, 2022
4ed467e
new do_step wraper replaces read/set_vars wrappers
Aug 8, 2022
0f08232
clean up
Aug 8, 2022
c708d1d
Merge branch '55-restructure-simulation-api-for-do_step' of https://g…
Aug 8, 2022
0b1307f
initialize new class structure, exemplary with discrete-fmu-simulatio…
Aug 8, 2022
183ec29
draft for new structure
Aug 9, 2022
a856d10
appending to results frame right after discrete simulation step as gr…
Aug 9, 2022
7f266aa
add functionality for continuous fmu simulation in new structure
Aug 18, 2022
6dacd50
add functionality for dymola simulation
Aug 18, 2022
be2a901
example for discrete FMU simulation with new structure
Aug 22, 2022
17c8589
implement changes of issue #59
Aug 23, 2022
09d3996
check if variables are part of model in discrete fmu simulation metho…
Aug 24, 2022
a7b6b40
organize todo's
Aug 25, 2022
f6c9fad
reorganize script strucure for simulation api
Aug 30, 2022
e31dd89
adjust path in unit test
Sep 1, 2022
4eb4e73
adjust sim api unit test to consider config
Sep 1, 2022
8ddddae
adjust sim api arguments for unit test
Sep 1, 2022
1a82f2f
add restriction to avoid unknown settings to be added to sim setup
Sep 1, 2022
89e3daa
extend unit tests to test example for discrete fmu simulation
Sep 1, 2022
354235d
adjust pylintrc
Sep 1, 2022
601e737
update config after its elements are changed
Sep 2, 2022
0320841
restructure discrete fmu example
Sep 8, 2022
bf6654c
add docstrings
Sep 8, 2022
f610fea
introduce abstract class for Discrete Simululation to obtain smmetry …
Sep 12, 2022
b6164bf
improve pylint score
Sep 12, 2022
64b4d68
minor bug
Sep 12, 2022
ba1f86b
dummy declarations of class attributes that where previously only de…
Sep 18, 2022
1381e83
minor change
Sep 19, 2022
943be26
minor change
Sep 21, 2022
a043a1b
add unit test for discrete fmu api to test set up and close
Sep 21, 2022
a20f7eb
manually implement changes within master from 50057aa to 878edea to a…
Sep 21, 2022
b03130f
minor bug in unit test structure
Sep 27, 2022
a92f4de
Merge remote-tracking branch 'origin' into 55-restructure-simulation-…
Oct 7, 2022
7d0d605
Merge pull request #66 from RWTH-EBC/master
KBeeser Oct 7, 2022
0bf1f36
activate functionality of reproduction (#27)
Oct 21, 2022
7d8ebf3
minor changes (mostly types and documentation) requested in review of…
Oct 24, 2022
c9331bf
add read variables function in discrete fmu api that adds current tim…
Oct 24, 2022
c0fb149
minor changes due to conversation in PR #65
Oct 24, 2022
22f94c6
test if input data covers the whole time grid in discrete simulation …
Oct 24, 2022
4dcc9b8
provide backwards compatibility for the continuous simulation apis
Oct 25, 2022
50b8705
delete log and simulation files
Oct 25, 2022
bfbd9e8
adjusted unit test structure and naming for simulation api related tests
Nov 1, 2022
cf0ec20
delete log files
Nov 1, 2022
a583302
add functionality of pr #68
Nov 28, 2022
6833c69
minor changes improving pylint
Nov 28, 2022
db12f7e
minor change due to pylint
kobeeser Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ebcpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"""
# Pull the useful classes to the top Level
from .data_types import TimeSeriesData, TimeSeries
from .simulationapi.dymola_api import DymolaAPI
from .simulationapi.fmu import FMU_API
from .optimization import Optimizer

from .simulationapi.fmu import FMU_API, FMU_Discrete
from .simulationapi.dymola import DymolaAPI

__version__ = '0.3.2'
5 changes: 2 additions & 3 deletions ebcpy/data_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ def _load_df_from_file(self, file):
) from err
return df


def get_variable_names(self) -> List[str]:
"""
Return an alphabetically sorted list of all variables
Expand Down Expand Up @@ -357,8 +356,8 @@ def get_tags(self, variable: str = None) -> List[str]:

def get_columns_by_tag(self,
tag: str,
variables: list =None,
return_type: str='pandas',
variables: list = None,
return_type: str = 'pandas',
drop_level: bool = False):
"""
Returning all columns with defined tag in the form of ndarray.
Expand Down
Loading