Changeset 1367 in Sophya

Timestamp:

Jan 3, 2001, 4:11:55 PM (25 years ago)

Author:

aubourg

Message:

bounds

Location:

trunk/ArchTOIPipe

Files:

• Kernel/fitstoirdr.cc (modified) (1 diff)
• Kernel/toiprocessor.cc (modified) (3 diffs)
• Kernel/toiprocessor.h (modified) (1 diff)
• TestPipes/tsttoi2.cc (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -72 +72 @@
 
 int FITSTOIReader::calcMinOut() {
-  return firstSn;
+  TOIManager* mgr = TOIManager::getManager();
+  int firstReq = mgr->getRequestedBegin();
+  return firstSn > firstReq ? firstSn : firstReq;
 }
 
 int FITSTOIReader::calcMaxOut() {
-  return firstSn + nrows - 1;
+  TOIManager* mgr = TOIManager::getManager();
+  int lastReq = mgr->getRequestedEnd();
+  int lastSn  = firstSn + nrows - 1;
+  return lastSn < lastReq ? lastSn : lastReq;
 }
 

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -110 +110 @@
 
 int TOIProcessor::getInputTOIIndex(string toi) {
+  chkinit();
   map<string, int>::iterator i = inIx.find(toi);
   if (i == inIx.end()) return -1;
@@ -116 +117 @@
 
 int TOIProcessor::getOutputTOIIndex(string toi) {
+  chkinit();
   map<string, int>::iterator i = outIx.find(toi);
   if (i == outIx.end()) return -1;
@@ -136 +138 @@
   toi->setProducer(this);
   outTOIs[(*i).second] = toi; 
+}
+
+string TOIProcessor::getOutName(int i) {
+  if (i > outIx.size()) throw RangeCheckError("TOIProcessor::getOutName "
+                                             " out of bound");
+  map<string, int>::iterator j = outIx.begin();
+  while (i) {i--; j++;};
+  return (*j).first;
+}
+
+string TOIProcessor::getInName(int i) {
+  if (i > inIx.size()) throw RangeCheckError("TOIProcessor::getInName "
+                                             " out of bound");
+  map<string, int>::iterator j = inIx.begin();
+  while (i) {i--; j++;};
+  return (*j).first;
 }
 

trunk/ArchTOIPipe/Kernel/toiprocessor.h

@@ -91 +91 @@
   virtual void  addOutput(string name, TOI* toi);
 
+
+  int getNIn()  {chkinit(); return inIx.size();}
+  int getNOut() {chkinit(); return outIx.size();}
+  string getOutName(int i);
+  string getInName(int i);
+
   virtual void  start();
   

trunk/ArchTOIPipe/TestPipes/tsttoi2.cc

@@ -14 +14 @@
 
   
-  TOI* toi = new TOIRegularDeque("t1");
+  TOI* toi = new TOIRegularWindow("t1");
   //  toi->dbg=true;
   r.addOutput("boloMuV_11", toi);
   w.addInput("bolo_filtered", toi);
   
-  cout << "starting" << endl;
-
   r.start();
   w.start();
 
-  cout << "joining" << endl;
   mgr->joinAll();
 }