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

Jump to bottom

Multi modification #3545

Merged
merged 16 commits into from
Sep 20, 2024
Merged

Multi modification #3545

merged 16 commits into from
Sep 20, 2024

Conversation

HansOlsson
Copy link
Collaborator

Closes #3474

Note that:

  • I only added two of the given test-cases, since the others were for merging of modifiers and I believe that should be clear enough (otherwise we can add another PR).
  • I restricted this handling it to the cases we agree on, and added examples for that well. If we don't want that restriction it would be possible to exclude those commits.

@HansOlsson HansOlsson mentioned this pull request Jun 28, 2024
Closed
henrikt-ma
henrikt-ma reviewed Jun 29, 2024
View reviewed changes
Copy link
Collaborator

@henrikt-ma henrikt-ma left a comment

Choose a reason for hiding this comment

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

I abstain from reviewing the technical content, as this is an area I don't understand well enough.

@HansOlsson
Copy link
Collaborator Author

@qlambert-pro does this agree with your understanding?

@maltelenz
Copy link
Collaborator

@qlambert-pro does this agree with your understanding?

FYI @qlambert-pro is on extended parental leave, so don't expect an answer from him in the short term.

@HansOlsson HansOlsson added this to the 2024-September milestone Aug 30, 2024
eshmoylova
eshmoylova requested changes Sep 3, 2024
View reviewed changes
Copy link
Member

@eshmoylova eshmoylova left a comment

Choose a reason for hiding this comment

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

I believe that is consistent with what we agreed on. I like the examples. Just a souple of suggestions to clarify the text.

chapters/inheritance.tex Outdated Show resolved Hide resolved
@HansOlsson @eshmoylova
Update chapters/inheritance.tex
c9dfbbe 
Co-authored-by: Elena Shmoylova <[email protected]>
@HansOlsson
Copy link
Collaborator Author

I believe that is consistent with what we agreed on. I like the examples. Just a souple of suggestions to clarify the text.

That should now be done.

@HansOlsson
Copy link
Collaborator Author

I believe that is consistent with what we agreed on. I like the examples. Just a souple of suggestions to clarify the text.

That should now be done.

@eshmoylova can you re-review to indicate if you agree with the update

eshmoylova
eshmoylova requested changes Sep 19, 2024
View reviewed changes
Copy link
Member

@eshmoylova eshmoylova left a comment

Choose a reason for hiding this comment

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

One problem is that redeclarations, constrainedby-clauses, their modifications and how to merge them are not introduced until the next section. Maybe adding some links to the corresponding sections would help?

chapters/inheritance.tex Outdated Show resolved Hide resolved
@eshmoylova eshmoylova mentioned this pull request Sep 19, 2024
Closed
eshmoylova
eshmoylova approved these changes Sep 20, 2024
View reviewed changes
Copy link
Member

@eshmoylova eshmoylova left a comment

Choose a reason for hiding this comment

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

Looks good. Thank you.

@HansOlsson HansOlsson merged commit 5910648 into modelica:master Sep 20, 2024
1 check passed
@HansOlsson HansOlsson deleted the MultiModification branch September 20, 2024 14:40
@HansOlsson HansOlsson added the M37 For pull requests merged into Modelica 3.7 label Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henrikt-ma henrikt-ma henrikt-ma left review comments

@eshmoylova eshmoylova eshmoylova approved these changes

@qlambert-pro qlambert-pro Awaiting requested review from qlambert-pro

Assignees
No one assigned
Labels
M37 For pull requests merged into Modelica 3.7
Projects
None yet
Milestone
2024-September
Development

Successfully merging this pull request may close these issues.

Multiple modifications and merging of modifications.
4 participants
@HansOlsson @maltelenz @eshmoylova @henrikt-ma