Changeset 1464 in Sophya for trunk/ArchTOIPipe/Kernel/toi.cc

Timestamp:

Apr 11, 2001, 12:01:44 PM (24 years ago)

Author:

ansari

Message:

1) Fin de passage des flags en int_8
2) TOIRegularWindow mis ds un fichier spare , Reza 11/4/2001

File:

• trunk/ArchTOIPipe/Kernel/toi.cc (modified) (6 diffs)

trunk/ArchTOIPipe/Kernel/toi.cc

@@ -9 +9 @@
 #endif
 
-#define CHKSYNC(ctx)  
-//  if (((TOIRegularWindow*)this)->data.size() != ((TOIRegularWindow*)this)->flags.size())        \
-//    cout << ctx << ((TOIRegularWindow*)this)->data.size() << "  " <<  \
-//      ((TOIRegularWindow*)this)->flags.size() << endl;  \
 
 TOI::TOI() {
@@ -73 +69 @@
 }
 
-#ifndef NO_SOPHYA
+/* 
+ RZCMV   ----- l'interface va etre modifiee, NE PAS UTILISER
+#ifndef NO_SOPHYA 
 Array TOI::getError(int iStart, int iEnd) {
   if (errorTOI == NULL) throw NotFoundExc("TOI::getDataError : no Error TOI");
-  return errorTOI->getData(iStart, iEnd);
+  return errorTOI->getData(iStart, iEnd); 
+}
+Array TOI::getData(int iStart, int iEnd) {
+  lock();
+  Array a = doGetData(iStart, iEnd);
+  unlock();
+  if (fgsigput) { fgsigput = false; broadcast(); }
+  return a;
+}
+TArray<int_4> TOI::getFlag(int iStart, int iEnd) {
+  lock();
+  TArray<int_4> a = doGetFlag(iStart, iEnd);
+  unlock();
+  if (fgsigput) { fgsigput = false; broadcast(); }
+  return a;
 }
 #endif
-
-/*RZCMV
+  l'interface va etre modifiee, NE PAS UTILISER ---- 
+*/
+
+
+/* 
+RZCMV  -------   A revoir les getError() ...
 double TOI::getError(int i) {
   if (errorTOI == NULL) throw NotFoundExc("TOI::getDataError : no Error TOI");
@@ -94 +110 @@
 */
 
-#ifndef NO_SOPHYA
-Array TOI::getData(int iStart, int iEnd) {
-  lock();
-  Array a = doGetData(iStart, iEnd);
-  unlock();
-  if (fgsigput) { fgsigput = false; broadcast(); }
-  return a;
-}
-#endif
-
 double TOI::getData(int i) {
   lock();
-  int_4 flg;
+  int_8 flg;
   double dat;
   doGetData(i, dat, flg);
@@ -114 +120 @@
 }
 
-void TOI::getData(int i, double &data,int_4 &flag) {
+void TOI::getData(int i, double &data,int_8 &flag) {
   lock();
   doGetData(i, data, flag);
@@ -122 +128 @@
 }
 
-
-
-#ifndef NO_SOPHYA
-TArray<int_4> TOI::getFlag(int iStart, int iEnd) {
-  lock();
-  TArray<int_4> a = doGetFlag(iStart, iEnd);
-  unlock();
-  if (fgsigput) { fgsigput = false; broadcast(); }
-  return a;
-}
-#endif
-
   
-  
-
-void TOI::putData(int i, double value, int_4 flag) {
+
+void TOI::putData(int i, double value, int_8 flag) {
   lock();
   doPutData(i, value, flag);
@@ -208 +201 @@
 
 
-TOIRegularWindow::TOIRegularWindow() {
-  i0 = -1;
-}
-
-TOIRegularWindow::TOIRegularWindow(string nm) {
-  i0 = -1;
-  setName(nm);
-}
-
-TOIRegularWindow::~TOIRegularWindow() {
-}
-
-TOI::DataStatus TOIRegularWindow::isDataAvailNL(int iStart, int iEnd) {
-  if (iEnd >= i0 + (long)data.size()) return DATA_NOT_YET;
-  if (iStart < i0) return DATA_DELETED;
-  return DATA_OK;
-}
-
-TOI::DataStatus TOIRegularWindow::isDataAvailNL(int i) {
-  return TOI::isDataAvailNL(i);
-}
-
-void TOIRegularWindow::doWontNeedBefore(int i) {
-  if (i>= i0 + (long)data.size())
-    i = i0 + (long)data.size() - 1;
-  if (i>i0) {  // don't empty list
-    int osz = data.size();
-    data.erase(data.begin(), data.begin()+(i-i0));
-    flags.erase(flags.begin(), flags.begin()+(i-i0));
-    i0 = i;
-  }
-}
-
-
-#ifndef NO_SOPHYA
-Array TOIRegularWindow::doGetData(int iStart, int iEnd) {
-  if (!isDataAvailNL(iStart, iEnd)) {
-    throw RangeCheckError("TOI::getData : data not available");
-  }
-  Array dat(iEnd - iStart + 1);
-  long j0 = iStart - i0;
-  for (int i=0; i<iEnd-iStart+1; i++) {
-    dat[i] = data[i+j0];
-  }
-  return dat;
-}
-#endif
-
-void TOIRegularWindow::doGetData(int i, double & val, int_4 & flg) {
-  if (isDataAvailNL(i) != DATA_OK) {
-    cerr << "TOI::getData : data not available " << i << endl;
-    throw RangeCheckError("TOI::getData : data not available");
-  }
-
-  val = data[i - i0];
-  flg = flags[i - i0];
-
-}
-
-
-#ifndef NO_SOPHYA
-TArray<int_4> TOIRegularWindow::doGetFlag(int iStart, int iEnd) {
-  if (isDataAvailNL(iStart, iEnd) != DATA_OK) throw RangeCheckError("TOI::getData : data not available");
-  TArray<int_4> dat(iEnd - iStart + 1);
-  long j0 = iStart - i0;
-  for (int i=0; i<iEnd-iStart+1; i++) {
-    dat[i] = flags[i+j0];
-  }
-  return dat;
-}
-#endif
-
-/*RZCMV
-int_4 TOIRegularWindow::doGetFlag(int i) {
-  if (isDataAvailNL(i) != DATA_OK) {
-    cerr << "TOI::getFlag : data not available " << i << endl;
-    throw RangeCheckError("TOI::getFlag : data not available");
-  }
-  return flags[i - i0]; 
-}
-*/
-
-
-void TOIRegularWindow::doPutData(int i, double value, int_4 flag) {
-  if (i0 == -1) {
-    data.insert(data.begin(), 1,  defaultValue);
-    flags.insert(flags.begin(), 1,  0);
-    i0 = i;
-  } else if (i<i0) {
-    data.insert(data.begin(), i0-i, defaultValue); 
-    flags.insert(flags.begin(), i0-i, 0);
-    i0 = i;
-  } else if (i>=i0+(int)data.size()) {
-    data.insert(data.end(), (long)  (i-(i0+data.size())+1), defaultValue);
-    flags.insert(flags.end(), (long) (i-(i0+flags.size())+1), 0);
-  }
-  data[i-i0] = value;
-  flags[i-i0] = flag;  
-}
-
-bool TOIRegularWindow::hasSomeData() {
-  lock();
-  bool x = !data.empty();
-  unlock();
-  return x;
-}
-
-int TOIRegularWindow::nextDataAvail(int iAfter) {
-  lock();
-  if (iAfter >= i0 + (long)data.size()) {unlock(); return -1;}
-  if (iAfter < i0) {unlock(); return i0;}
-  unlock();
-  return iAfter+1;
-}
-
-/*  A faire, le nettoyage (heuristique selon demandes ?, guide ? ) */
-                 
-