Changeset 061ea67 in git

Timestamp:

Sep 10, 2013, 7:07:37 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

1b70fe982adba74b2d7a2f4766d7ec6d103a2cf2

Parents:

918ca09282483016057240878bd4a20cd2d7305f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-09-10 19:07:37+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-09-10 19:09:02+02:00

Message:

fix: correct usage of ..Alloc0Bin..

File:

• libpolys/polys/ext_fields/transext.cc (modified) (18 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -355 +355 @@
   poly g = p_Copy(NUM(f), ntRing);
   poly h = NULL; if (!DENIS1(f)) h = p_Copy(DEN(f), ntRing);
-  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  fraction result = (fraction)omAllocBin(fractionObjectBin);
   NUM(result) = g;
   DEN(result) = h;
@@ -416 +416 @@
 
   NUM (result) = p_Copy (NUM (f), ntRing); // ???
-  DEN (result) = NULL;
-  COM (result) = 0;
+  //DEN (result) = NULL; // done by ..Alloc0..
+  //COM (result) = 0; // done by ..Alloc0..
 
   ntTest((number)result);
@@ -431 +431 @@
 
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  DEN (result)= NULL;
-  COM (result)= 0;
+  //DEN (result)= NULL; // done by ..Alloc0..
+  //COM (result)= 0; // done by ..Alloc0..
 
   if (IS0(a))
@@ -597 +597 @@
   {
      NUM(result) = p_NSet(n, A);
-     DEN(result) = NULL;
+     //DEN(result) = NULL; // done by ..Alloc0..
      n_Delete(&den, C);
-  } else
+  }
+  else
   {
      DEN(result) = p_NSet(den, A);
@@ -606 +607 @@
   }
 
-  COM(result) = 0;
+  //COM(result) = 0; // done by ..Alloc0..
 
   ntTest((number)result);
@@ -676 +677 @@
   p_Normalize(p, ntRing);
   NUM(f) = p;
-  COM(f) = 0;
+  //COM(f) = 0; // done by omAlloc0
 
   //check_N((number)f,cf);
@@ -819 +820 @@
   ntTest(d);
 
-  if (IS0(d)) 
+  if (IS0(d))
   {
     WerrorS("ringvar expected");
@@ -840 +841 @@
 
   fraction fa = (fraction)a;
+  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   if (DENIS1(fa))
   {
-     fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
      NUM(result) = p_Diff(NUM(fa),k,ntRing);
-     DEN(result) = NULL;
+     //DEN(result) = NULL; // done by ..Alloc0..
      COM(result) = COM(fa);
      //check_N((number)result,cf);
@@ -850 +851 @@
   }
 
-  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   poly fg = p_Mult_q(p_Copy(DEN(fa),ntRing),p_Diff(NUM(fa),k,ntRing),ntRing);
   poly gf = p_Mult_q(p_Copy(NUM(fa),ntRing),p_Diff(DEN(fa),k,ntRing),ntRing);
@@ -892 +892 @@
                                                    ntRing);
 
-  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  fraction result = (fraction)omAllocBin(fractionObjectBin);
   NUM(result) = g;
   DEN(result) = f;
@@ -932 +932 @@
                                                    ntRing);
 
-  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  fraction result = (fraction)omAllocBin(fractionObjectBin);
   NUM(result) = g;
   DEN(result) = f;
@@ -958 +958 @@
   if (g == NULL) return NULL; // may happen due to zero divisors???
 
-  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  fraction result = (fraction)omAllocBin(fractionObjectBin);
 
   NUM(result) = g;
@@ -1788 +1788 @@
       if (p_IsOne(num_f, ntRing))
       {
-        DEN(result)=NULL;
+        //DEN(result)=NULL;// Alloc0
         COM(result) = 0;
         p_Delete(&num_f,ntRing);
@@ -1794 +1794 @@
     }
   }
-  else
-  {
-    DEN(result) = NULL;
-    COM(result) = 0;
-  }
+  //else// Alloc0
+  //{
+  //  DEN(result) = NULL;
+  //  COM(result) = 0;
+  //}
   ntTest((number)result); // !!!!
   //check_N((number)result,cf);
@@ -1867 +1867 @@
      h = prCopyR(DEN(f), rSrc, rDst);
 
-  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  fraction result = (fraction)omAllocBin(fractionObjectBin);
 
   NUM(result) = g;
@@ -1916 +1916 @@
   p_SetCoeff(p, n_Copy(a, src), dst->extRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(f) = p; DEN(f) = NULL; COM(f) = 0;
+  NUM(f) = p; // DEN(f) = NULL; COM(f) = 0;
   assume(n_Test((number)f, dst));
   //check_N((number)f,dst);
@@ -1939 +1939 @@
   p_SetCoeff(p, q, dst->extRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(f) = p; DEN(f) = NULL; COM(f) = 0;
+  NUM(f) = p; // DEN(f) = NULL; COM(f) = 0;
   assume(n_Test((number)f, dst));
   //check_N((number)f,dst);
@@ -2080 +2080 @@
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(f) = p;
-  DEN(f) = NULL;
-  COM(f) = 0;
+  //DEN(f) = NULL;
+  //COM(f) = 0;
 
   ntTest((number)f);