Changeset 555 in Sophya for trunk/Poubelle/archTOI.old/toiproducer.cc

Timestamp:

Nov 9, 1999, 3:04:05 PM (26 years ago)

Author:

ansari

Message:

portage cxx en cours

File:

• trunk/Poubelle/archTOI.old/toiproducer.cc (modified) (10 diffs)

trunk/Poubelle/archTOI.old/toiproducer.cc

@@ -57 +57 @@
   // should be nothing left
   if (!extraopts.empty()) return false;
-  
+
   return true;
 }
@@ -129 +129 @@
 
 class comp2nd { public:bool operator()(pair<long, double> const& a, long b) {return a.first<b;}};
-
-deque<pair<long, double> >::const_iterator TOIProducer::findHist(TOI const& toi,long sampleNum) {
+class comp2ndI { public:bool operator()(long a, pair<long, double> const& b) {return a<b.first;}};
+
+deque<pair<long, double> >::const_iterator TOIProducer::findHistL(TOI const& toi,long sampleNum) {
   CHKPROD
   deque<pair<long, double> >& h = history[toi.ref];
@@ -136 +137 @@
 }
 
-deque<pair<long, double> >::const_iterator TOIProducer::findHist(deque<pair<long, double> >& h,long sampleNum) {
+deque<pair<long, double> >::const_iterator TOIProducer::findHistL(deque<pair<long, double> >& h,long sampleNum) {
   return lower_bound(h.begin(), h.end(), sampleNum, comp2nd());
 }
+
+deque<pair<long, double> >::const_iterator TOIProducer::findHistH(TOI const& toi,long sampleNum) {
+  CHKPROD
+  deque<pair<long, double> >& h = history[toi.ref];
+  return upper_bound(h.begin(), h.end(), sampleNum, comp2ndI());
+}
+
+deque<pair<long, double> >::const_iterator TOIProducer::findHistH(deque<pair<long, double> >& h,long sampleNum) {
+  return upper_bound(h.begin(), h.end(), sampleNum, comp2ndI());
+}
+
 
 bool TOIProducer::canGetValue(long sampleNum, TOI const& toi) {
@@ -145 +157 @@
   if (h.empty()) return false;
   if (sampleNum < h.front().first || sampleNum > h.back().first) return false;
-  deque<pair<long, double> >::const_iterator i = findHist(h, sampleNum);
+  deque<pair<long, double> >::const_iterator i = findHistL(h, sampleNum);
   if (i == h.end()) return false;
   return ((*i).first == sampleNum);
@@ -163 +175 @@
   deque<pair<long, double> >& h = history[toi.ref];
   if (h.empty()) return false;
-  return (sampleNum > h.back().first && sampleNum <= h.front().first);
+  return (sampleNum > h.front().first && sampleNum <= h.back().first);
    // Must be inside, otherwise we don't know if it is prev or simply past
 }
@@ -171 +183 @@
   deque<pair<long, double> >& h = history[toi.ref];
   if (h.empty()) return false;
-  return (sampleNum >= h.back().first && sampleNum < h.front().first);
+  return (sampleNum >= h.front().first && sampleNum < h.back().first);
 }
 
@@ -179 +191 @@
 //       << h.front().first 
 //       << " " << h.back().first << endl;
-  deque<pair<long, double> >::const_iterator i = findHist(h, sampleNum);
+  deque<pair<long, double> >::const_iterator i = findHistL(h, sampleNum);
   if (i == h.end()) return -999999;
 //  cout << "found " << (*i).first << endl;
@@ -189 +201 @@
 double TOIProducer::getPrevValue(long& sampleNum, TOI const& toi) {
   deque<pair<long, double> >& h = history[toi.ref];
-  deque<pair<long, double> >::const_iterator i = findHist(h, sampleNum);
+  deque<pair<long, double> >::const_iterator i = findHistH(h, sampleNum);
   if (i == h.end()) return -999999;
-  if ((*i).first == sampleNum) {
+  pair<long, double> tstpair = *i;
+  while ((*i).first >= sampleNum) {
     if (i == history[toi.ref].begin()) {sampleNum = -99999 ;return -9999;}
     i--;
   }
+  tstpair = *i;
   sampleNum = (*i).first;
   return (*i).second;
@@ -201 +215 @@
 double TOIProducer::getNextValue(long& sampleNum, TOI const& toi) {
   deque<pair<long, double> >& h = history[toi.ref];
-  deque<pair<long, double> >::const_iterator i = findHist(h, sampleNum);
+  deque<pair<long, double> >::const_iterator i = findHistL(h, sampleNum);
   if (i == h.end()) return -999999;
-  if ((*i).first == sampleNum) {
+  pair<long, double> tstpair = *i;
+  while ((*i).first <= sampleNum) {
     if (i == history[toi.ref].end()) {sampleNum = -99999 ;return -9999;}
     i++;
   }
+  tstpair=*i;
   sampleNum = (*i).first;
   return (*i).second;
@@ -212 +228 @@
 
 void TOIProducer::computedValue(TOI const& toi, long sampleNum, double value) {
-  map<int, deque<pair<long, double> > >::iterator i = history.find(toi.ref);
-  if (i == history.end()) throw ArchExc("computedValue : bad TOI " + toi.name);
-  deque<pair<long, double> >& h = (*i).second;
+  //map<int, deque<pair<long, double> > >::iterator i = history.find(toi.ref);
+  //if (i == history.end()) throw ArchExc("computedValue : bad TOI " + toi.name);
+  //deque<pair<long, double> >& h = (*i).second;
+  deque<pair<long, double> >& h = history[toi.ref];
   if (!h.empty() && sampleNum <= h.back().first)
     throw ArchExc("computedValue : sampleNum not in sequence for " + toi.name);
   h.push_back(pair<long,double>(sampleNum,value));
-  
   for (map<TOIAbsorber*, set<TOI> >::iterator j = clients.begin(); j != clients.end(); j++) {
     set<TOI>& tois = (*j).second;