Skip to content

Conversation

@mmatera
Copy link
Contributor

@mmatera mmatera commented Mar 25, 2021

@rocky , OK: you asked for tests, here you have tests :)

@rocky
Copy link
Member

rocky commented Mar 25, 2021

@mmatera Thanks! This helps a lot. I will look over and addresss this over the upcoming weekend.

@mmatera
Copy link
Contributor Author

mmatera commented Mar 25, 2021

@mmatera Thanks! This helps a lot. I will look over and addresss this over the upcoming weekend.

I plan also to add the same tests, but for inequalities

@rocky rocky force-pushed the extensecmptests branch from a831252 to a188a4c Compare March 26, 2021 22:54
@rocky
Copy link
Member

rocky commented Mar 26, 2021

@mmatera not that by issuing git rebsae master in this branch we went from 9 files changed to 4.

@mmatera
Copy link
Contributor Author

mmatera commented Mar 26, 2021

@mmatera not that by issuing git rebsae master in this branch we went from 9 files changed to 4.

I made a push --force on this branch, sorry. Is it possible to undo that? Otherwise, please push your local branch again, and then I merge it with my local branch

@rocky rocky force-pushed the extensecmptests branch from 86e274a to a188a4c Compare March 26, 2021 23:00
@rocky
Copy link
Member

rocky commented Mar 26, 2021

@mmatera not that by issuing git rebsae master in this branch we went from 9 files changed to 4.

I made a push --force on this branch, sorry. Is it possible to undo that? Otherwise, please push your local branch again, and then I merge it with my local branch

No problem. For pushed. Does it make sense why I suggest the rebase over the merge?

@mmatera
Copy link
Contributor Author

mmatera commented Mar 26, 2021

@rocky, in this branch I made some changes in test/help.py to avoid some problems in the comparison of the expected and obtained results. The idea is that the output is passed through a ToString, and then converted to a Python string, while the expected is stated in the form of a string. This probably implies making changes on the other tests.

@mmatera
Copy link
Contributor Author

mmatera commented Mar 26, 2021

@mmatera not that by issuing git rebsae master in this branch we went from 9 files changed to 4.

I made a push --force on this branch, sorry. Is it possible to undo that? Otherwise, please push your local branch again, and then I merge it with my local branch

No problem. For pushed. Does it make sense why I suggest the rebase over the merge?

OK, what I did is a merge in this branch from master. From which commit should I do a rebase?

@rocky
Copy link
Member

rocky commented Mar 26, 2021

@mmatera not that by issuing git rebsae master in this branch we went from 9 files changed to 4.

I made a push --force on this branch, sorry. Is it possible to undo that? Otherwise, please push your local branch again, and then I merge it with my local branch

No problem. For pushed. Does it make sense why I suggest the rebase over the merge?

OK, what I did is a merge in this branch from master. From which commit should I do a rebase?

This is the process I did in order to try to remove duplicate changes to get a smaller set of changes to work with:

$ git checkout master
$ git pull origin HEAD
$ git checkout extensecmptests
$ git rebase master

Here is how you can get this branch as it is now saving your existing branch.

$ git checkout extensecmptests
$ git checkout -b extensecmptests-save # this saves the existing branch
$ git checkout master
$ git branch -d extensecmptests  # may need -D instead of -d
$ git fetch 
$ git checkout extensecmptests

fix duplicated DirectedInfinity entry

clean and improved tests

fix duplicated DirectedInfinity entry

restoring tests

Fix Positive/Negative tests

clean and working
@mmatera
Copy link
Contributor Author

mmatera commented Mar 27, 2021

Well, here is the rebase. Also, I marked the non-working tests to be skipped. However, there are still a couple of doctests that are failing. I think that the bests would be to merge this branch after everything get fixed...

@mmatera
Copy link
Contributor Author

mmatera commented Mar 29, 2021

@rocky: I am splitting these cases with this ugly framework because I want to understand the logic and where things go wrong. When I finish, I will try to comment line by line, and then, we can see how to improve this code.

@mmatera
Copy link
Contributor Author

mmatera commented Mar 30, 2021

I close this in favor of #1209

@mmatera mmatera closed this Mar 30, 2021
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