Changeset 2b7f4e in git

Timestamp:

Aug 12, 2011, 8:34:32 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

e7e815050f6c74d4fc691c162a9a76687b36c5c3

Parents:

3da9f4eecf506fa238a5377a07d73051db6ceb9b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 20:34:32+02:00

git-committer:

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

Message:

FIX: rDefault(const char*) - returns a handle... moved to ipshell
CHG: minor changes in ffields

Files:

• Singular/ipshell.h (modified) (1 diff)
• libpolys/coeffs/ffields.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/ipshell.h

@@ -204 +204 @@
 void checkall();
 #endif
+
 void rSetHdl(idhdl h);
 ring rInit(sleftv* pn, sleftv* rv, sleftv* ord);
+idhdl  rDefault(const char *s);
+
 idhdl rSimpleFindHdl(ring r, idhdl root, idhdl n=NULL);
 idhdl rFindHdl(ring r, idhdl n, idhdl w);

libpolys/coeffs/ffields.cc

@@ -813 +813 @@
   assume( getCoeffType(r) == n_GF );
 
-  GFInfo* p = (GFInfo *)(parameter); 
+  GFInfo* p = (GFInfo *)(parameter);
+  assume (p->GFChar > 0);
+  assume (p->GFDegree > 0);
+
   const char * name = p->GFPar_name;
+  
   r->m_nfCharQ = 0;
   r->m_nfCharP = p->GFChar;
   r->m_nfCharQ1 = 0;
-  r->m_nfParameter= strdup(name); //TODO use omAlloc for allocating memory and use strcpy?
+  r->m_nfParameter= omStrDup(name); //TODO use omAlloc for allocating memory and use strcpy?
   r->m_nfPlus1Table= NULL;
 
   r->has_simple_Alloc=TRUE;
   r->has_simple_Inverse=TRUE;
-
-  assume (p->GFChar > 0);
-  assume (p->GFDegree > 0);
 
   if(p->GFChar > (2<<15))

libpolys/polys/monomials/ring.h

@@ -336 +336 @@
 ////////// DEPRECATED
 /////// void   rChangeCurrRing(ring r);
-//void   rSetHdl(idhdl h);
-//ring   rInit(sleftv* pn, sleftv* rv, sleftv* ord);
-idhdl  rDefault(const char *s);
+
 ring   rDefault(int ch, int N, char **n);
 ring   rDefault(const coeffs cf, int N, char **n);
-ring rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
-ring rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
+ring   rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
+ring   rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
 
 // #define rIsRingVar(A) r_IsRingVar(A,currRing)