Changeset c4d065 in git for gfanlib/gfanlib_polymakefile.cpp

Timestamp:

Nov 26, 2010, 4:37:58 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

92e2cd1822dc1be6a8ef69173615a30e5bd67d0e

Parents:

9e7d85ecc0703de24759963ee74edd60d4139c09

Message:

coding at Goettingen (cones&fans)

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

File:

• gfanlib/gfanlib_polymakefile.cpp (modified) (5 diffs)

gfanlib/gfanlib_polymakefile.cpp

@@ -10 +10 @@
 #include <assert.h>
 #include <sstream>
+#include <istream>
 
 using namespace std;
@@ -31 +32 @@
 }
 
-static string readUntil(FILE *f, int c)
+static string readUntil(istream &f, int c)
 {
   stringstream ret;
   int c2;
-  c2=fgetc(f);
-  while(c2!=c && c2!=EOF)
-    {
+  c2=f.get();
+//  c2=fgetc(f);
+//  while(c2!=c && c2!=EOF)
+  while(c2!=c && !f.eof())
+  {
       ret<<char(c2);
-      c2=fgetc(f);
-    }
+      //c2=fgetc(f);
+      c2=f.get();
+  }
   return ret.str();
 }
@@ -67 +71 @@
 
 
-void PolymakeFile::open(const char *fileName_)
+void PolymakeFile::open(std::istream &f)
+{
+  isXml=false;
+//  fileName=string(fileName_);
+
+//  FILE *f=fopen(fileName.c_str(),"r");
+//  if(!f)//fprintf(Stderr,"Could not open file:\"%s\"\n",fileName_);
+//  assert(f);
+
+  int c=f.get();//fgetc(f);
+  while(!f.eof())
+    {
+      if(c=='_')
+        {
+          readUntil(f,'\n');
+        }
+      else if(c!='\n')
+        {
+          f.unget();
+          //          ungetc(c,f);
+          string name=readUntil(f,'\n');
+
+//          fprintf(Stderr,"Reading:\"%s\"\n",name.c_str());
+          stringstream value;
+          while(1)
+            {
+              string l=readUntil(f,'\n');
+              if(l.size()==0)break;
+              value << l <<endl;
+            }
+          properties.push_back(PolymakeProperty(name.c_str(),value.str().c_str()));
+        }
+      c=f.get();//fgetc(f);
+    }
+}
+
+/*void PolymakeFile::open(const char *fileName_)
 {
   isXml=false;
@@ -101 +141 @@
     }
 }
-
-
+*/
 void PolymakeFile::create(const char *fileName_, const char *application_, const char *type_, bool isXml_)
 {
@@ -244 +283 @@
 ZMatrix PolymakeFile::readMatrixProperty(const char *p, int height, int width)
 {
-  ZMatrix ret(height,width);
+  ZMatrix ret(0,width);
 
   assert(hasProperty(p,true));
   list<PolymakeProperty>::iterator prop=findProperty(p);
   stringstream s(prop->value);
-  for(int i=0;i<height;i++)
+//  for(int i=0;i<height;i++)
+  for(int i=0;;i++)
+  {
+    if(i==height)break;
+    ZVector w(width);
     for(int j=0;j<width;j++)
-      {
-        int v;
-        eatComment(s);
-        s>>v;
-        ret[i][j]=v;
-      }
+        {
+          int v;
+          eatComment(s);
+          s>>v;
+          if(s.eof())goto done;
+          w[j]=v;
+        }
+    ret.appendRow(w);
+  }
+  done:
+
+  if(height>=0)assert(ret.getHeight()==height);
+//  cerr<<p;
+ //   eatComment(s);
+   // int v;
+   // s>>v;
+//  while(!s.eof())std::cerr<<char(s.get());
+ // assert(s.eof());
 
   return ret;