Changeset 6b8106 in git for libpolys/coeffs/numbers.cc

Timestamp:

Sep 13, 2012, 2:59:47 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1592b986a21bcaba5633414189a7b08c5cce6213

Parents:

2ed48b369bc0d2a3c22dd1fc1ff4b91704e73ec6f768d91b15a3cda106e7c041c7889cda1828dbfe

Message:

Merge pull request #185 from alexanderdreyer/spielwiese-countedref

attributes treated accordingly by 'reference' and 'shared'

File:

• libpolys/coeffs/numbers.cc (modified) (6 diffs)

libpolys/coeffs/numbers.cc

@@ -131 +131 @@
   assume(!(  nCoeff_is_Q(r) || nCoeff_is_Q_a(r) ));
   // all coeffs are given by integers!!!
-  assume( nCoeff_is_Ring(r) || nCoeff_is_Zp(r) || nCoeff_is_numeric(r) || nCoeff_is_GF(r) || nCoeff_is_Zp_a(r) );
 
   numberCollectionEnumerator.Reset();
+
+  if( !numberCollectionEnumerator.MoveNext() ) // empty zero polynomial?
+  {
+    c = n_Init(1, r);
+    return;
+  }  
+
+  number &curr = numberCollectionEnumerator.Current();
   
 #ifdef HAVE_RINGS
@@ -141 +148 @@
     if (nCoeff_has_Units(r))
     {
-      c = n_GetUnit(numberCollectionEnumerator.Current(), r);
+      c = n_GetUnit(curr, r);
       
       if (!n_IsOne(c, r))
@@ -147 +154 @@
         number inv = n_Invers(c, r);
 
-        do
+        n_InpMult(curr, inv, r);
+        
+        while( numberCollectionEnumerator.MoveNext() )
         {
-          n_InpMult(numberCollectionEnumerator.Current(), inv, r);
+          number &n = numberCollectionEnumerator.Current();
+          n_Normalize(n, r); // ?
+          n_InpMult(n, inv, r); // TODO: either this or directly divide!!!?
         }
-        while( numberCollectionEnumerator.MoveNext() );
 
         n_Delete(&inv, r);        
@@ -162 +172 @@
 
   assume(!nCoeff_is_Ring(r));
-
-  c = numberCollectionEnumerator.Current();
+  assume(nCoeff_is_Zp(r) || nCoeff_is_numeric(r) || nCoeff_is_GF(r) || nCoeff_is_Zp_a(r));
+
+  c = curr;
   
   n_Normalize(c, r);
@@ -169 +180 @@
   if (!n_IsOne(c, r))
   {    
-    numberCollectionEnumerator.Current() = n_Init(1, r); // ???
+    curr = n_Init(1, r); // ???
     
     number inv = n_Invers(c, r);
@@ -177 +188 @@
       number &n = numberCollectionEnumerator.Current();
       n_Normalize(n, r); // ?
-      n_InpMult(n, inv, r);
+      n_InpMult(n, inv, r); // TODO: either this or directly divide!!!?
     }