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

Implementing new combinators into dblPendulum #2479

Merged
merged 5 commits into from
May 21, 2021

Conversation

Ant13731
Copy link
Collaborator

Contributes #2399
Contributes #2476
Implemented some higher level combinators in the pendulum example. I think compoundNC allows for a level 3 combination between NamedIdeas, but I had to place it into the database. Although I'm not sure if Assumptions.hs is the best place for it.

Copy link
Owner

@JacquesCarette JacquesCarette left a comment

Choose a reason for hiding this comment

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

Overall, good stuff. But as this is being edited, may as well do it 'right'. Nice side-effect of fixing bad periods on the output.

code/drasil-example/Drasil/DblPendulum/Assumptions.hs Outdated Show resolved Hide resolved
code/drasil-example/Drasil/DblPendulum/Concepts.hs Outdated Show resolved Hide resolved
@Ant13731
Copy link
Collaborator Author

This should be okay to merge now (and resolve the requested changes). I know we already discussed changing the naming scheme and moving some combinators in other issues, but I think it would be easier to just start on a fresh branch.

@JacquesCarette JacquesCarette merged commit b8f8fd8 into master May 21, 2021
@JacquesCarette JacquesCarette deleted the implementingNewCombinators branch May 21, 2021 01:57
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.

2 participants