now reads files successfully; still doesn't create SDAI instances

mpictor · mpictor · commit 48f345685c43 · 2013-01-21T20:21:25.000-05:00
diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt
@@ -10,6 +10,7 @@ include_directories(
     ${SCL_SOURCE_DIR}/src/cldai
     ${SCL_SOURCE_DIR}/src/clstepcore
     ${SCL_SOURCE_DIR}/src/clutils
+    ${SCL_SOURCE_DIR}/src/base
 )
 
 
diff --git a/src/cllazyfile/lazyP21DataSectionReader.cc b/src/cllazyfile/lazyP21DataSectionReader.cc
@@ -24,7 +24,10 @@ const namedLazyInstance lazyP21DataSectionReader::nextInstance() {
 //     std::cerr << "inst id start: " << _file.tellg() << std::endl;
 //     _file >> i.loc.instance;
 //     std::cerr << "inst start: " << _file.tellg() << std::endl;
-    assert( _file.good() );
+    if( !_file.good() ) {
+        i.loc.end = i.loc.begin;
+        return i;
+    }
     _file >> std::ws;
     char c = _file.get();
     if( c != '=' ) {
diff --git a/src/cllazyfile/main.cc b/src/cllazyfile/main.cc
@@ -1,7 +1,9 @@
 #include "lazyInstMgr.h"
-//     g++ main.cc -I. -o main
+#include <sc_benchmark.h>
 
 int main (int argc, char ** argv ) {
+    benchmark stats( "p21 lazy load test" );
+
     std::string n;
     if( argc == 2 ) {
         n = argv[1];
@@ -10,4 +12,11 @@ int main (int argc, char ** argv ) {
     }
     lazyInstMgr mgr;
     mgr.openFile( n );
+    instanceTypeMMap_range r,s;
+    r = mgr.getInstances("POSITIVE_LENGTH_MEASURE");
+    s = mgr.getInstances("VERTEX_POINT");
+    //count those
+
+    stats.stop();
+    stats.out();
 }
diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc
@@ -50,8 +50,11 @@ std::streampos sectionReader::findString( const std::string& str, bool semicolon
     if( resetPos ) {
         _file.seekg(current);
     }
-    assert( _file.is_open() && _file.good() );
-    return found;
+    if( _file.is_open() && _file.good() ) {
+        return found;
+    } else {
+        return -1;
+    }
 }
 
 //NOTE different behavior than const char * GetKeyword( istream & in, const char * delims, ErrorDescriptor & err ) in read_func.cc
@@ -93,24 +96,28 @@ instanceID sectionReader::readInstanceNumber() {
     std::streampos hash,eq;
     char c;
     instanceID id = -1;
+//     std::string s;
 
     hash = findString( "#" );
     eq = findString( "=" );
-    std::cerr << "id from " << hash << " to " << eq << std::endl;
+//     std::cerr << "id from " << hash << " to " << eq << std::endl;
     _file.seekg( hash );
     do {
         //check chars in between
         _file.get( c );
+//         s.append(1,c);
+//         std::cout << c;
         if( !isdigit( c ) && ( c != ' ' ) && ( c != '\t' ) && ( c != '\n' ) ) {
             hash = findString( "#" );
             if( hash > eq ) {
                 eq = findString( "=" );
                 _file.seekg( hash );
             }
-            std::cerr << "id from " << hash << " to " << eq << std::endl;
+//             std::cerr << "id from " << hash << " to " << eq << std::endl;
             _file >> ws;
+//             s.clear();
         }
-    } while( _file.tellg() < eq && _file.good() );
+    } while( _file.tellg() < ( eq - 1L ) && _file.good() );
     if( _file.good() ) {
         _file.seekg( hash );
         _file >> id;

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ include_directories(`
`10`	`10`	`${SCL_SOURCE_DIR}/src/cldai`
`11`	`11`	`${SCL_SOURCE_DIR}/src/clstepcore`
`12`	`12`	`${SCL_SOURCE_DIR}/src/clutils`
	`13`	`+ ${SCL_SOURCE_DIR}/src/base`
`13`	`14`	`)`
`14`	`15`
`15`	`16`