Changeset 3181 in Sophya for trunk/SophyaLib/HiStats

Timestamp:

Feb 10, 2007, 9:32:30 AM (19 years ago)

Author:

ansari

Message:

Correction bug ds BaseDataTable::GetColumnD() (vu par Farharng), Reza 10/02/2007

File:

• trunk/SophyaLib/HiStats/basedtable.cc (modified) (1 diff)

trunk/SophyaLib/HiStats/basedtable.cc

@@ -433 +433 @@
     switch (mNames[k].type) {
     case IntegerField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv(i) = mIColsP[sk]->GetCstSegment(is)[j];
       break;
     case LongField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv(i) = mLColsP[sk]->GetCstSegment(is)[j];
       break;
     case FloatField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv(i) = mFColsP[sk]->GetCstSegment(is)[j];
       break;
     case DoubleField :
     case DateTimeField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv(i) = mDColsP[sk]->GetCstSegment(is)[j];
       break;
     case ComplexField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv(i) = mYColsP[sk]->GetCstSegment(is)[j].real();
       break;
     case DoubleComplexField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv(i) = mZColsP[sk]->GetCstSegment(is)[j].real();
       break;
     case StringField :
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)
         rv = atof(mSColsP[sk]->GetCstSegment(is)[j].c_str());
       break;
     default:
-      for(sa_size_t j=0; j<SegmentSize(); j++,i++)  rv(i) = BADVAL;
+      for(sa_size_t j=0; (j<SegmentSize())&&(i<NEntry()); j++,i++)  
+        rv(i) = BADVAL;
       break;
     }