Changeset 8fefd9 in git

Timestamp:

Feb 10, 1999, 5:00:06 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

0657ace87ca43ae077c25b316e4feb228b2ca2e7

Parents:

b5b60f6a163ac80df02fc29021d8d41d287d50fe

Message:

* hannes/pohl: added psarse matrices (temp. disabled)


git-svn-id: file:///usr/local/Singular/svn/trunk@2835 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• Makefile.in (modified) (6 diffs)
• iparith.cc (modified) (1 diff)
• ring.cc (modified) (3 diffs)
• ring.h (modified) (2 diffs)
• sparsmat.cc (added)
• sparsmat.h (added)

Singular/Makefile.in

@@ -73 +73 @@
     longalg.cc longrat.cc longrat0.cc \
     maps.cc matpol.cc misc.cc \
-    mminit.cc modulop.cc \
+    mminit.cc modulop.cc sparsmat.cc \
     fglm.cc fglmzero.cc fglmvec.cc fglmgauss.cc fglmhom.cc fglmcomb.cc \
     numbers.cc polys.cc polys0.cc polys1.cc polys-impl.cc \
@@ -97 +97 @@
         febase.h ipshell.h shortfl.h tok.h \
         mmemory.h mmprivate.h mmheap.h mmpage.h page.h \
-        ffields.h khstd.h silink.h \
+        ffields.h khstd.h silink.h sparsmat.h \
         fglm.h comm.h kstd1.h modulop.h sing_dbm.h weight.h \
         fglmgauss.h fglmvec.h kstd2.h mpsr.h sing_mp.h \
@@ -123 +123 @@
      longalg.o spolys0.o syz.o syz0.o syz1.o weight.o weight0.o \
      ipid.o ipshell.o iplib.o ipassign.o ipconv.o ipprint.o\
-     polys.o polys0.o polys1.o polys-impl.o extra.o\
+     polys.o polys0.o polys1.o polys-impl.o extra.o sparsmat.o\
      mminit.o mmtables.o mmalloc.o mmheap.o mmpage.o page.o \
      mmisc.o mmcheck.o mmbt.o sing_dld.o sing_dbm.o silink.o \
@@ -340 +340 @@
      ipid.og ipshell.og iplib.og ipassign.og ipconv.og ipprint.og\
      polys.og polys0.og polys1.og polys-impl.og extra.og\
-     mminit.og sing_dld.og sing_dbm.og silink.og \
+     mminit.og sing_dld.og sing_dbm.og silink.og sparsmat.og\
      sing_mp.og fglm.og fglmzero.og fglmvec.og fglmgauss.og fglmhom.og\
      algmap.og clapconv.og  clapmem.og clapsing.og \
@@ -416 +416 @@
      ipid.op ipshell.op iplib.op ipassign.op ipconv.op ipprint.op\
      polys.op polys0.op polys1.op polys-impl.op extra.op\
-     mminit.op sing_dld.op sing_dbm.op silink.op \
+     mminit.op sing_dld.op sing_dbm.op silink.op sparsmat.op\
      sing_mp.op fglm.op fglmzero.op fglmvec.op fglmgauss.op fglmhom.op\
      algmap.op clapconv.op  clapmem.op clapsing.op \
@@ -442 +442 @@
      ipid.ob ipshell.ob iplib.ob ipassign.ob ipconv.ob ipprint.ob\
      polys.ob polys0.ob polys1.ob polys-impl.ob extra.ob\
-     mminit.ob sing_dld.ob sing_dbm.ob silink.ob \
+     mminit.ob sing_dld.ob sing_dbm.ob silink.ob sparsmat.ob\
      sing_mp.ob fglm.ob fglmzero.ob fglmvec.ob fglmgauss.ob fglmhom.ob\
      algmap.ob clapconv.ob  clapmem.ob clapsing.ob \

Singular/iparith.cc

@@ -1256 +1256 @@
 {
   if(u->name==NULL) return TRUE;
-  char * n = (char *)AllocL(strlen(u->name) + 6);
-  sprintf(n,"%s(%d)",u->name,(int)v->Data());
+  char * nn = (char *)AllocL(strlen(u->name) + 13);
+  sprintf(nn,"%s(%d)",u->name,(int)v->Data());
   FreeL((ADDRESS)u->name);
   u->name=NULL;
+  char *n=mstrdup(nn);
+  FreeL((ADDRESS)nn);
 #ifdef HAVE_NAMESPACES
   if(u->req_packhdl != NULL)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.42 1998-12-16 12:08:38 Singular Exp $ */
+/* $Id: ring.cc,v 1.43 1999-02-10 16:00:04 Singular Exp $ */
 
 /*
@@ -670 +670 @@
 // More particularly, sets r->VarOffset
 
-void rComplete(ring r)
+void rComplete(ring r, int force)
 {
   int VarCompIndex, VarLowIndex, VarHighIndex;
@@ -1897 +1897 @@
 }
 
+void rUnComplete(ring r)
+{
+  Free((ADDRESS)r->VarOffset,(r->N + 1)*sizeof(int));
+  r->VarOffset=NULL;
+}
+
 #ifdef RDEBUG
 // This should eventually become a full-fledge ring check, like pTest

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.19 1998-12-03 17:58:05 Singular Exp $ */
+/* $Id: ring.h,v 1.20 1999-02-10 16:00:05 Singular Exp $ */
 
 /* includes */
@@ -44 +44 @@
 int    rIsExtension();
 int    rSum(ring r1, ring r2, ring &sum);
-void   rComplete(ring r);
+void   rComplete(ring r, int force = 0);
+void   rUnComplete(ring r);
 int    rBlocks(ring r);