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

time! is revised #150

Merged
merged 3 commits into from
Jun 14, 2024
Merged

time! is revised #150

merged 3 commits into from
Jun 14, 2024

Conversation

ocots
Copy link
Member

@ocots ocots commented Jun 11, 2024

First merge #147 then this one.

@ocots ocots requested a review from jbcaillau June 11, 2024 19:18
@ocots ocots changed the base branch from main to constraint_revise June 11, 2024 19:18
@ocots ocots changed the base branch from constraint_revise to main June 11, 2024 19:18
@ocots
Copy link
Member Author

ocots commented Jun 11, 2024

I have revised time!. There is only one method. For the unitary test, I have added a file test/utils.jl with auxiliary __time! methods to keep the tests as there were.

Copy link

codecov bot commented Jun 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.05%. Comparing base (f7f23cc) to head (ec9e3b1).
Report is 57 commits behind head on main.

Current head ec9e3b1 differs from pull request most recent head f6e69d4

Please upload reports for the commit f6e69d4 to get more accurate results.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #150      +/-   ##
==========================================
- Coverage   81.52%   80.05%   -1.48%     
==========================================
  Files          16       17       +1     
  Lines        1873     1955      +82     
==========================================
+ Hits         1527     1565      +38     
- Misses        346      390      +44     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jbcaillau jbcaillau marked this pull request as draft June 11, 2024 21:48
Copy link
Member

Choose a reason for hiding this comment

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

@ocots at some point, we should switch to Variable / NonVariable instead of Fixed / NonFixed (maybe keeping the old syntax). I plead guilty on this 🙁

Copy link
Member

@jbcaillau jbcaillau Jun 11, 2024

Choose a reason for hiding this comment

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

@ocots now Index is only used to store internally (= a user will not see it, even with the functional API) the index of the variable associated with free initial / final time 👍🏽

And nice consistency checks!

Copy link
Member

Choose a reason for hiding this comment

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

@ocots 👍🏽

@jbcaillau
Copy link
Member

@ocots more or less resolved conflicts between __constraint! from main and _time! from this branch, but still need to correct some tests (not passing). having a look at it, then merging 🤞🏾

@jbcaillau
Copy link
Member

@ocots will do it tonight / tomorrow

still need to correct some tests (not passing). having a look at it, then merging 🤞🏾

@ocots
Copy link
Member Author

ocots commented Jun 12, 2024

I am watching you 🥸

@ocots
Copy link
Member Author

ocots commented Jun 13, 2024

So?

@ocots
Copy link
Member Author

ocots commented Jun 13, 2024

I have updated the tests.

Copy link
Member

@jbcaillau jbcaillau left a comment

Choose a reason for hiding this comment

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

@ocots thanks 👍🏽 for updating the tests: couldn't find time to do it yesterday 🙏🏽

test/utils.jl Show resolved Hide resolved
@jbcaillau jbcaillau marked this pull request as ready for review June 14, 2024 15:58
@jbcaillau jbcaillau merged commit eda4107 into main Jun 14, 2024
4 checks passed
@jbcaillau jbcaillau deleted the time_revise branch June 14, 2024 15:59
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