Skip to content

DA definition#730

Merged
smartie2076 merged 18 commits intofeature/minimal_degree_of_autonomyfrom
feature/DA_def
Jan 5, 2021
Merged

DA definition#730
smartie2076 merged 18 commits intofeature/minimal_degree_of_autonomyfrom
feature/DA_def

Conversation

@TheOneAndra
Copy link
Copy Markdown
Collaborator

@TheOneAndra TheOneAndra commented Dec 16, 2020

Changes proposed in this pull request:

  • Change definition of DA
  • Add DA link ton constraint.csv description

The following steps were realized, as well (if applies):

  • For new functionalities: Explain in readthedocs
  • Update the CHANGELOG.md

Please mark above checkboxes as following:

  • Open
  • Done

❌ Check not applicable to this PR

For more information on how to contribute check the CONTRIBUTING.md.

@TheOneAndra TheOneAndra mentioned this pull request Dec 16, 2020
20 tasks
@mahendrark mahendrark force-pushed the feature/minimal_degree_of_autonomy branch 2 times, most recently from e674bfe to 834c8cd Compare December 17, 2020 08:58
@TheOneAndra
Copy link
Copy Markdown
Collaborator Author

TheOneAndra commented Dec 17, 2020

@mahendrark Would have been easier that you wait for this branch to be merged into feature/minimal_degree_of_autonomy before rebasing feature/minimal_degree_of_autonomy

@mahendrark
Copy link
Copy Markdown
Contributor

mahendrark commented Dec 17, 2020

@mahendrark Would have been easier that you wait for this branch to be merged into feature/minimal_degree_of_autonomy before rebasing feature/minimal_degree_of_autonomy

Is there a problem? What happens in parent branch should typically not affect the child branch, except for merge conflicts.

@smartie2076
Copy link
Copy Markdown
Collaborator

smartie2076 commented Dec 17, 2020

@mahendrark Would have been easier that you wait for this branch to be merged into feature/minimal_degree_of_autonomy before rebasing feature/minimal_degree_of_autonomy

Is there a problem? What happens in parent branch should typically not affect the child branch, except for merge conflicts.

Hmhm, I am also confused now why there are so many changes compared to the original PR #726... I would have guessed that @TheOneAndras changes only affect few files, especially not the .py files...

@TheOneAndra: Please remove Fix #721 from the first post - this should be changed only from my PR #726.

Copy link
Copy Markdown
Collaborator

@smartie2076 smartie2076 left a comment

Choose a reason for hiding this comment

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

I think the formula should be adapted. Does it still work, then?

I am not sure why you have so many commits (from my branch, nonetheless) - this would probably be a good case for a rebase onto my current branch feature/minimal_degree_of_autonomy.

Copy link
Copy Markdown
Collaborator

@smartie2076 smartie2076 left a comment

Choose a reason for hiding this comment

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

Also, there should be a changelog entry that you changed the DA definition in the RTD, and that you changed some rtd data to include the min DA as well.

TheOneAndra and others added 2 commits January 5, 2021 12:51
apply @smartie2076  comment for the changelog
Co-authored-by: smartie2076 <[email protected]>
@smartie2076 smartie2076 merged commit 2691ecf into feature/minimal_degree_of_autonomy Jan 5, 2021
@smartie2076 smartie2076 deleted the feature/DA_def branch January 5, 2021 13:53
@smartie2076 smartie2076 mentioned this pull request Jan 7, 2021
11 tasks
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