-
Notifications
You must be signed in to change notification settings - Fork 12
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
Feature: ECCO Algorithm #783
Open
restenb
wants to merge
35
commits into
master
Choose a base branch
from
feature/ecco
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
An implementation of `algorithm::do_step()` is supposed to return the length of the step that was taken by the algorithm. In our ECCO implementation, it instead returned the size of the *next* step. This commit fixes that, plus gets rid of a couple of signed-unsigned comparison warnings.
# Conflicts: # src/cosim/osp_config_parser.cpp
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.
At long last, a working implementation of ECCO that also supports configuring powerbonds from the system structure.
Some choices had to be made to allow this, but here are the most relevant changes:
<Algorithm>
in OspSystemStructure now accepts eitherecco
orfixedStep
.OspSystemStructure
as follows:powerbond="mypowerbond"
to either aVariableConnection
orVariableGroupConnection
element. This defines a name for the powerbond that the parsing uses to group correctly.port
has been added to theVariable
element. Here the user must specify whether the variable is theinput
oroutput
port of it's side of the bond. So, if we are coupling for instance a force <-> velocity bond, this results in a tuple with one input and one output port for eachVariableConnection
that is used in the bond.osp_config_parser
, which results in apower_bond_map
available through thesystem_structure
object.power_bond_map
is iterated and power bonds added to the algorithm byexecution::inject_system_structure
. The testecco_algorithm_from_system_structure_test.cpp
has been added to showcase this.This PR is on the larger side, and while there aren't any breaking changes to worry about, input on improvements to the code and usability are very welcome.