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

CCi #2537

Draft
wants to merge 25 commits into
base: development
Choose a base branch
from
Draft

CCi #2537

wants to merge 25 commits into from

Conversation

klee669
Copy link
Contributor

@klee669 klee669 commented Jul 1, 2022

Creating complex interval.

@mahrud
Copy link
Member

mahrud commented May 24, 2023

Would you like help with resolving the conflicts?

I tried rebasing this on top of the development branch, except dropping the last two merge and revert commits, basically keeping the following commits:

  • toCCi and addition are added
  • minus, times are added
  • division added, toCCi with more input types added
  • Fixed typical type error
  • Fixed errors and too large intervals in division
  • power added
  • Partial fix to powers
  • Improved squaring for CCi powers
  • Fixed error in powers and added exponential
  • Fixed shift error
  • ===, compare functions added
  • floor, round functions added
  • absfun, format added
  • left,right,midpoint,toExternalString added
  • diameter, subset, intersect, toExternalString added
  • minor fix on isEmptyCCi
  • some changes in reals.m2
  • warnings fixed, interval function added
  • Update reals.m2
  • sqrt added
  • Update actors3.d
  • aring-CCi created
  • Update aring-CCi.hpp

I also added an empty aring-CCi.cpp file, but aring-CCi.hpp has errors so it cannot be included yet.

Together, this seems to compile fine but the tests are still running here:
https://github.com/mahrud/M2/actions/runs/5064998116

Would you like me to force push to your branch so the tests can run on this PR?

@mahrud
Copy link
Member

mahrud commented May 24, 2023

Looks like only one test failed, but I don't see why:

-- testing Macaulay2/Core/basictests/D01.m2
Macaulay2/Core/basictests/D01.m2:4:54:(0):[4]: error: assertion failed 
Macaulay2/Core/basictests/D01.m2:4:27:(0):[3]: --back trace--
Macaulay2/Core/basictests/D01.m2:4:1:(0):[2]: --back trace--

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.

None yet

2 participants