Changeset 613174 in git for libpolys/polys/monomials/ring.cc

Timestamp:

Feb 4, 2011, 3:19:22 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ea11dcde9c525e14e42ef49423d3913e03d714de

Parents:

9c83f2d5961f53cfc901a6f7d33a1e2f1b32e707

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-02-04 15:19:22+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:28+01:00

Message:

rInternalChar removed, n_SetMap

File:

• libpolys/polys/monomials/ring.cc (modified) (9 diffs)

libpolys/polys/monomials/ring.cc

@@ -793 +793 @@
   && (rInternalChar(r1)==rInternalChar(r2)))
   {
-    tmpR.ch=rInternalChar(r1);
+    tmpR.ch=r1->ch;
     if (rField_is_Q(r1)||rField_is_Zp(r1)||rField_is_GF(r1)) /*Q, Z/p, GF(p,n)*/
     {
@@ -946 +946 @@
           || (r2->ch==-r1->ch)) /* Z/p */
       {
-        tmpR.ch=rInternalChar(r1);
+        tmpR.ch=r1->ch;
         tmpR.P=rPar(r1);
         tmpR.parameter=(char **)omAlloc(rPar(r1)*sizeof(char *));
@@ -1007 +1007 @@
       if (r2->ch==0) /* Q */
       {
-        tmpR.ch=rInternalChar(r1);
+        tmpR.ch=r1->ch;
         tmpR.P=rPar(r1);
         tmpR.parameter=(char **)omAlloc(rPar(r1)*sizeof(char *));
@@ -1391 +1391 @@
       idTest((ideal)C);
 
-      nMapFunc nMap1 = n_SetMap(R1,sum); /* can change something global: not usable
-                                            after the next nSetMap call :( */
+      nMapFunc nMap1 = n_SetMap(R1->cf,sum->cf); /* can change something global: not usable
+                                                    after the next nSetMap call :( */
       // Create blocked C and D matrices:
       for (i=1; i<= rVar(R1); i++)
@@ -1408 +1408 @@
 
 
-      nMapFunc nMap2 = n_SetMap(R2,sum); /* can change something global: not usable
-                                            after the next nSetMap call :( */
+      nMapFunc nMap2 = n_SetMap(R2->cf,sum->cf); /* can change something global: not usable
+                                                    after the next nSetMap call :( */
       for (i=1; i<= rVar(R2); i++)
         for (j=i+1; j<=rVar(R2); j++)
@@ -1475 +1475 @@
                sum->names, rVar(sum), sum->parameter, rPar(sum),
                perm1, par_perm1, sum->ch);
-    nMapFunc nMap1 = n_SetMap(r1,sum);
+    nMapFunc nMap1 = n_SetMap(r1->cf,sum->cf);
     Q1 = idInit(IDELEMS(r1->qideal),1);
     for (int for_i=0;for_i<IDELEMS(r1->qideal);for_i++)
@@ -1492 +1492 @@
                sum->names, rVar(sum), sum->parameter, rPar(sum),
                perm2, par_perm2, sum->ch);
-    nMapFunc nMap2 = n_SetMap(r2,sum);
+    nMapFunc nMap2 = n_SetMap(r2->cf,sum->cf);
     Q2 = idInit(IDELEMS(r2->qideal),1);
     for (int for_i=0;for_i<IDELEMS(r2->qideal);for_i++)
@@ -5419 +5419 @@
     int *perm       = (int *)omAlloc0((rVar(r)+1)*sizeof(int));
     int *par_perm   = NULL;
-    nMapFunc nMap   = n_SetMap(src,r);
+    nMapFunc nMap   = n_SetMap(src->cf,r->cf);
     int ni,nj;
     for(i=1; i<=r->N; i++)
@@ -5536 +5536 @@
   const ring srcBase = src;
 
-  assume( n_SetMap(srcBase,dest) == n_SetMap(dest,dest) ); // currRing is important here!
+  assume( n_SetMap(srcBase->cf,dest->cf) == n_SetMap(dest->cf,dest->cf) ); // currRing is important here!
 
   matrix C = mpNew(N,N); // ring independent