Changeset 213d64 in git

Timestamp:

Sep 6, 2011, 7:41:41 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

8971393da48956f59e22d5443b7384017185f219

Parents:

08e15e7aa667fe0a2a40175b200adac4ea0592ca

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-06 19:41:41+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:32+01:00

Message:

CHG: rootArranger::listOfRoots deals with lists => moved to Singular/ipshell.cc

Files:

• Singular/ipshell.cc (modified) (4 diffs)
• numeric/mpr_numeric.h (modified) (2 diffs)

Singular/ipshell.cc

@@ -57 +57 @@
 #include <coeffs/mpr_complex.h>
 #include <coeffs/longrat.h>
+
 #include <numeric/mpr_base.h>
 #include <numeric/mpr_numeric.h>
@@ -4516 +4517 @@
   {
     arranger->arrange();
-    listofroots= arranger->listOfRoots( gmp_output_digits );
+    listofroots= listOfRoots(arranger, gmp_output_digits );
   }
   else
@@ -4545 +4546 @@
 
 // from mpr_numeric.cc
-lists rootArranger::listOfRoots( const unsigned int oprec )
+lists listOfRoots( rootArranger* self, const unsigned int oprec )
 {
   int i,j,tr;
-  int count= roots[0]->getAnzRoots(); // number of roots
-  int elem= roots[0]->getAnzElems();  // number of koordinates per root
+  int count= self->roots[0]->getAnzRoots(); // number of roots
+  int elem= self->roots[0]->getAnzElems();  // number of koordinates per root
 
   lists listofroots= (lists)omAlloc( sizeof(slists) ); // must be done this way!
 
-  if ( found_roots )
+  if ( self->found_roots )
   {
     listofroots->Init( count );
@@ -4566 +4567 @@
         {
           onepoint->m[j].rtyp=STRING_CMD;
-          onepoint->m[j].data=(void *)complexToStr((*roots[j])[i],oprec,
-                          currRing->cf);
+          onepoint->m[j].data=(void *)complexToStr((*self->roots[j])[i],oprec, currRing->cf);
         }
         else
         {
           onepoint->m[j].rtyp=NUMBER_CMD;
-          onepoint->m[j].data=(void *)nCopy((number)(roots[j]->getRoot(i)));
+          onepoint->m[j].data=(void *)n_Copy((number)(self->roots[j]->getRoot(i)), currRing->cf);
         }
         onepoint->m[j].next= NULL;

numeric/mpr_numeric.h

@@ -145 +145 @@
 //<-
 
+class slists; typedef slists * lists;
+
 //-> class rootArranger
 class rootArranger
 {
 public:
+  friend lists listOfRoots( rootArranger*, const unsigned int oprec );
+   
   rootArranger( rootContainer ** _roots,
                 rootContainer ** _mu,
@@ -156 +160 @@
   void solve_all();
   void arrange();
-
-  lists listOfRoots( const unsigned int oprec );
 
   const bool success() { return found_roots; }