Changeset 086e32 in git

Timestamp:

Jan 27, 2016, 2:31:29 PM (8 years ago)

Author:

Yue <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

803fa0dd53591dc136893f7fe2ee9841a5c64f6a

Parents:

b3505315c6774a9d4a7d4479c96f92820f1c6b71

git-author:

Yue <ren@mathematik.uni-kl.de>2016-01-27 14:31:29+01:00

git-committer:

Yue <ren@mathematik.uni-kl.de>2016-01-27 14:32:40+01:00

Message:

new: using cones in parallel.lib

Location:

Singular

Files:

• dyn_modules/gfanlib/bbcone.cc (modified) (4 diffs)
• links/ssiLink.cc (modified) (1 diff)
• links/ssiLink.h (modified) (2 diffs)

Singular/dyn_modules/gfanlib/bbcone.cc

@@ -12 +12 @@
 #include <Singular/ipshell.h>
 #include <Singular/blackbox.h>
+
+#include <Singular/links/ssiLink.h>
 
 #include <callgfanlib_conversion.h>
@@ -1739 +1741 @@
 }
 
-#if 0
+
+static void gfanIntegerWriteFd(gfan::Integer n, ssiInfo* dd)
+{
+  mpz_t tmp;
+  mpz_init(tmp);
+  n.setGmp(tmp);
+  mpz_out_str (dd->f_write,SSI_BASE, tmp);
+  mpz_clear(tmp);
+  fputc(' ',dd->f_write);
+}
+
+static void gfanZMatrixWriteFd(gfan::ZMatrix M, ssiInfo* dd)
+{
+  fprintf(dd->f_write,"%d %d ",M.getHeight(),M.getWidth());
+
+  for (int i=0; i<M.getHeight(); i++)
+  {
+    for (int j=0; j<M.getWidth(); j++)
+    {
+      gfanIntegerWriteFd(M[i][j],dd);
+    }
+  }
+}
+
 BOOLEAN bbcone_serialize(blackbox *b, void *d, si_link f)
 {
   ssiInfo *dd = (ssiInfo *)f->data;
+
   sleftv l;
   memset(&l,0,sizeof(l));
@@ -1748 +1774 @@
   l.data=(void*)"cone";
   f->m->Write(f, &l);
-  gfan::ZCone *Z=((gfan::ZCone*) d;
-  /* AMBIENT_DIM */ fprintf(dd->f_write("%d ",Z->ambientDimension());
-  /* FACETS or INEQUALITIES */ fprintf(dd->f_write("%d ",Z->areFacetsKnown());
+
+  gfan::ZCone *Z = (gfan::ZCone*) d;
+  fprintf(dd->f_write,"%d ",Z->areImpliedEquationsKnown()+Z->areFacetsKnown()*2);
+
   gfan::ZMatrix i=Z->getInequalities();
-....
-  /* LINEAR_SPAN or EQUATIONS */ fprintf(dd->f_write("%d ",Z->areImpliedEquationsKnown());
+  gfanZMatrixWriteFd(i,dd);
+
   gfan::ZMatrix e=Z->getEquations();
-....
-  /* RAYS */
-  gfan::ZMatrix r=Z->extremeRays();
-....
-  /* LINEALITY_SPACE */
-  gfan::ZMatrix l=Z->generatorsOfLinealitySpace();
-....
+  gfanZMatrixWriteFd(e,dd);
+
   return FALSE;
 }
+
+static gfan::Integer gfanIntegerReadFd(ssiInfo* dd)
+{
+  mpz_t tmp;
+  mpz_init(tmp);
+  s_readmpz(dd->f_read,tmp);
+  gfan::Integer n(tmp);
+  mpz_clear(tmp);
+  return n;
+}
+
+static gfan::ZMatrix gfanZMatrixReadFd(ssiInfo* dd)
+{
+  int r=s_readint(dd->f_read);
+  int c=s_readint(dd->f_read);
+
+  gfan::ZMatrix M(r,c);
+  for (int i=0; i<r; i++)
+  {
+    for (int j=0; j<c; j++)
+    {
+      M[i][j] = gfanIntegerReadFd(dd);
+    }
+  }
+  return M;
+}
+
 BOOLEAN bbcone_deserialize(blackbox **b, void **d, si_link f)
 {
   ssiInfo *dd = (ssiInfo *)f->data;
-  gfan::ZCone *Z;
-  /* AMBIENT_DIM */ = s_readint(dd->f_read);
-  /* areFacetsKnown: */ = s_readint(dd->f_read);
-  if (areFacetsKnown)
-  ....FACETS
-  else
-  ....INEQUALITIES
-  /* areImpliedEquationsKnown*/ = s_readint(dd->f_read);
-  if(areImpliedEquationsKnown)
-  ....EQUATIONS
-  else
-  ...LINEAR_SPAN
-  ...RAYS
-  ...LINEALITY_SPACE
+  int preassumptions = s_readint(dd->f_read);
+
+  gfan::ZMatrix i = gfanZMatrixReadFd(dd);
+  gfan::ZMatrix e = gfanZMatrixReadFd(dd);
+
+  gfan::ZCone* Z = new gfan::ZCone(i,e,preassumptions);
+
   *d=Z;
   return FALSE;
 }
-#endif
+
 void bbcone_setup(SModulFunctions* p)
 {
@@ -1798 +1840 @@
   b->blackbox_Assign=bbcone_Assign;
   b->blackbox_Op2=bbcone_Op2;
-  //b->blackbox_serialize=bbcone_serialize;
-  //b->blackbox_deserialize=bbcone_deserialize;
+  b->blackbox_serialize=bbcone_serialize;
+  b->blackbox_deserialize=bbcone_deserialize;
   p->iiAddCproc("","coneViaInequalities",FALSE,coneViaNormals);
   p->iiAddCproc("","coneViaPoints",FALSE,coneViaRays);

Singular/links/ssiLink.cc

@@ -65 +65 @@
 // 7->8: qring
 // 8->9: module: added rank
-
-typedef struct
-{
-  s_buff f_read;
-  FILE *f_write;
-  ring r;
-  pid_t pid; /* only valid for fork/tcp mode*/
-  int fd_read,fd_write; /* only valid for fork/tcp mode*/
-  char level;
-  char send_quit_at_exit;
-  char quit_sent;
-
-} ssiInfo;
 
 link_list ssiToBeClosed=NULL;

Singular/links/ssiLink.h

@@ -11 +11 @@
 #include <Singular/links/silink.h>
 
+typedef struct
+{
+  s_buff f_read;
+  FILE *f_write;
+  ring r;
+  pid_t pid; /* only valid for fork/tcp mode*/
+  int fd_read,fd_write; /* only valid for fork/tcp mode*/
+  char level;
+  char send_quit_at_exit;
+  char quit_sent;
+
+} ssiInfo;
+
 BOOLEAN ssiOpen(si_link l, short flag, leftv u);
 BOOLEAN ssiWrite(si_link l, leftv v);
@@ -21 +34 @@
 void sig_chld_hdl(int sig);
 #endif
-