Changeset d914cf0 in git

Timestamp:

Aug 12, 2011, 7:25:13 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

77bb59200a4a6c29f96eb37fb6da3b221d283eba

Parents:

c10515350d72537c759f372977e1d69188eed976

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 19:25:13+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:24:02+01:00

Message:

ADD/FIX: maGetPreimage exposed by kernel/preimage.* now

Files:

• Singular/iparith.cc (modified) (1 diff)
• kernel/makefile (modified) (2 diffs)
• kernel/preimage.cc (moved) (moved from libpolys/polys/monomials/preimage.cc) (5 diffs)
• kernel/preimage.h (added)
• kernel/test.cc (modified) (1 diff)
• libpolys/polys/monomials/maps.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

Singular/iparith.cc

@@ -31 +31 @@
 #include <kernel/kstd1.h>
 #include <kernel/timer.h>
+
+#include <kernel/preimage.h>
+
 #include <polys/monomials/ring.h>
 #include <Singular/subexpr.h>

kernel/makefile

@@ -83 +83 @@
     tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc \
     f5c.cc ratgring.cc shiftgb.cc gfan.cc \
-    linearAlgebra.cc nc.cc
+    linearAlgebra.cc nc.cc preimage.cc
+    
 CXXSOURCES2     = SingularBuilder.cpp
 
@@ -115 +116 @@
         mmalloc.h \
         semic.h \
-        gfan.h
+        gfan.h preimage.h
 
 DISTFILES=${SOURCES} ${HEADERS} ${ESOURCES} \

kernel/preimage.cc

@@ -1 @@
-// ideal maGetPreimage(ring theImageRing, map theMap,ideal id);
+#include "mod2.h"
+
+#include <omalloc/omalloc.h>
+#include <misc/auxiliary.h>
+#include <misc/options.h>
+#include <misc/intvec.h>
+
+#include <polys/polys.h>
+#include <polys/monomials/ring.h>
+
+
+#include <kernel/febase.h>
+#include <kernel/ideals.h>
+#include <kernel/kstd1.h>
+#include <kernel/khstd.h>
+
+#include <kernel/kutil.h>
+
+
+#ifdef HAVE_PLURAL
+#include <polys/nc/nc.h>
+#endif
+
+/*2
+*shifts the variables between minvar and maxvar of p  \in p_ring to the
+*first maxvar-minvar+1 variables in the actual ring
+*be carefull: there is no range check for the variables of p
+*/
+static poly pChangeSizeOfPoly(ring p_ring, poly p,int minvar,int maxvar, const ring dst_r)
+{
+  int i;
+  poly result = NULL,resultWorkP;
+  number n;
+
+  if (p==NULL) return result;
+  else result = p_Init(dst_r);
+  resultWorkP = result;
+  while (p!=NULL)
+  {
+    for (i=minvar;i<=maxvar;i++)
+      p_SetExp(resultWorkP,i-minvar+1,p_GetExp(p,i,p_ring),dst_r);
+    p_SetComp(resultWorkP,p_GetComp(p,p_ring),dst_r);
+    n=n_Copy(pGetCoeff(p),dst_r->cf);
+    p_SetCoeff(resultWorkP,n,dst_r);
+    p_Setm(resultWorkP,dst_r);
+    pIter(p);
+    if (p!=NULL)
+    {
+      pNext(resultWorkP) = p_Init(dst_r);
+      pIter(resultWorkP);
+    }
+  }
+  return result;
+}
+
+
 
 /*2
@@ -57 +112 @@
     {
       p = p_SortMerge(
-        pChangeSizeOfPoly(theImageRing,theMap->m[i],1,imagepvariables,tmpR),
-        tmpR);
+                      pChangeSizeOfPoly(theImageRing, theMap->m[i], 1, imagepvariables, tmpR),
+                      tmpR);
       p=p_Add_q(p,q,tmpR);
     }
@@ -70 +125 @@
   for (i=sourcering->N;i<sourcering->N+j0;i++)
   {
-    temp1->m[i] = p_SortMerge(pChangeSizeOfPoly(theImageRing,
-                         id->m[i-sourcering->N],1,imagepvariables,tmpR),tmpR);
+    temp1->m[i] = p_SortMerge(
+                              pChangeSizeOfPoly(theImageRing, id->m[i-sourcering->N], 1, imagepvariables, tmpR),
+                              tmpR);
   }
   for (i=sourcering->N+j0;i<sourcering->N+j;i++)
   {
-    temp1->m[i] = p_SortMerge(pChangeSizeOfPoly(theImageRing,
-                              theImageRing->qideal->m[i-sourcering->N-j0],
-                              1,imagepvariables,tmpR),tmpR);
+    temp1->m[i] = p_SortMerge(
+                              pChangeSizeOfPoly(theImageRing, theImageRing->qideal->m[i-sourcering->N-j0], 1, imagepvariables, tmpR),
+                              tmpR);
   }
   // we ignore here homogenity - may be changed later:
@@ -84 +140 @@
   for (i=0;i<IDELEMS(temp2);i++)
   {
-    if (pLowVar(temp2->m[i])<imagepvariables) p_Delete(&(temp2->m[i]),tmpR);
+    if (p_LowVar(temp2->m[i], currRing)<imagepvariables) p_Delete(&(temp2->m[i]),tmpR);
   }
 
@@ -96 +152 @@
     if (p!=NULL)
     {
-      q = p_SortMerge(pChangeSizeOfPoly(tmpR, p,imagepvariables+1,N),sourcering);
+      q = p_SortMerge(
+                      pChangeSizeOfPoly(tmpR, p, imagepvariables+1, N, sourcering),
+                      sourcering);
       if (j>=IDELEMS(temp1))
       {

kernel/test.cc

@@ -149 +149 @@
 // #include "PowerSeries.h" // Too old?
 
+#include "preimage.h"
 
 #include "nc.h"

libpolys/polys/monomials/maps.cc

@@ -159 +159 @@
   return result;
 }
-
-/*2
-*shifts the variables between minvar and maxvar of p  \in p_ring to the
-*first maxvar-minvar+1 variables in the actual ring
-*be carefull: there is no range check for the variables of p
-*/
-static poly pChangeSizeOfPoly(ring p_ring, poly p,int minvar,int maxvar, const ring dst_r)
-{
-  int i;
-  poly result = NULL,resultWorkP;
-  number n;
-
-  if (p==NULL) return result;
-  else result = p_Init(dst_r);
-  resultWorkP = result;
-  while (p!=NULL)
-  {
-    for (i=minvar;i<=maxvar;i++)
-      p_SetExp(resultWorkP,i-minvar+1,p_GetExp(p,i,p_ring),dst_r);
-    p_SetComp(resultWorkP,p_GetComp(p,p_ring),dst_r);
-    n=n_Copy(pGetCoeff(p),dst_r->cf);
-    p_SetCoeff(resultWorkP,n,dst_r);
-    p_Setm(resultWorkP,dst_r);
-    pIter(p);
-    if (p!=NULL)
-    {
-      pNext(resultWorkP) = p_Init(dst_r);
-      pIter(resultWorkP);
-    }
-  }
-  return result;
-}
-
 
 void maFindPerm(char **preim_names, int preim_n, char **preim_par, int preim_p,

libpolys/polys/monomials/p_polys.h

@@ -1920 +1920 @@
 
 /*----------------------------------------------------*/
-int   p_Var(poly mi,const ring r);
+int   p_Var(poly mi, const ring r);
 /// the minimal index of used variables - 1
-int   p_LowVar (poly p);
+int   p_LowVar (poly p, const ring r);
 
 /*----------------------------------------------------*/