Changeset 4d22d3 in git

Timestamp:

Nov 29, 2010, 1:27:32 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

af71455603162123e6412ac27852bb08ea8f5126

Parents:

9b3de5f869ff6e2bd56ac42abe6a8bf462e8153b

Message:

intvec for ssiLink

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

File:

• Singular/ssiLink.cc (modified) (8 diffs)

Singular/ssiLink.cc

@@ -32 +32 @@
 #include <kernel/longrat.h>
 #include <kernel/ideals.h>
+#include <kernel/intvec.h>
 #include "subexpr.h"
 #include "silink.h"
@@ -248 +249 @@
   {
     ssiWrite(l,&(dd->m[i]));
+  }
+}
+void ssiWriteIntvec(ssiInfo *d,intvec * v)
+{
+  fprintf(d->f_write,"%d ",v->length());
+  int i;
+  for(i=0;i<v->length();i++)
+  {
+    fprintf(d->f_write,"%d ",(*v)[i]);
   }
 }
@@ -505 +515 @@
   return L;
 }
+intvec* ssiReadIntvec(ssiInfo *d)
+{
+  int nr;
+  fscanf(d->f_read,"%d",&nr);
+  intvec *v=new intvec(nr);
+  for(int i=0;i<nr;i++)
+  {
+    fscanf(d->f_read,"%d",&((*v)[i]));
+  }
+  return v;
+}
 
 //**************************************************************************/
@@ -549 +570 @@
       {
         link_list hh=(link_list)ssiToBeClosed->next;
-        /* we know: l is the first entry in ssiToBeClosed-list */
+        /* we know: l is the first entry in ssiToBeClosed-list */
         while(hh!=NULL)
         {
@@ -559 +580 @@
           hh->l->data=NULL;
           SI_LINK_SET_CLOSE_P(hh->l);
-          link_list nn=(link_list)hh->next;
-          omFree(hh);
-          hh=nn;
+          link_list nn=(link_list)hh->next;
+          omFree(hh);
+          hh=nn;
         }
-        ssiToBeClosed->next=NULL;
+        ssiToBeClosed->next=NULL;
         close(pc[1]); close(cp[0]);
         d->f_read=fdopen(pc[0],"r");
@@ -935 +956 @@
     case 16: res->rtyp=NONE; res->data=NULL;
              break;
+    case 17: res->rtyp=INTVEC_CMD;
+             res->data=ssiReadIntvec(d);
+             break;
     case 99: ssiClose(l); exit(0);
     case 0: if (feof(d->f_read))
@@ -1031 +1055 @@
                    ssiWriteList(l,(lists)dd);
                    break;
+          case INTVEC_CMD:
+                   fprintf(d->f_write,"17 ");
+                   ssiWriteIntvec(d,(intvec *)dd);
+                   break;
           default: Werror("not implemented (t:%d, rtyp:%d)",tt, data->rtyp);
                    d->level=0;
@@ -1223 +1251 @@
 // 15 setring .......
 // 16 nothing
+// 17 intvec <len> ...
 //
 // 99: quit Singular