Changeset 2827 in Sophya for trunk/SophyaLib/HiStats/basedtable.cc

Timestamp:

Nov 2, 2005, 9:56:25 AM (20 years ago)

Author:

ansari

Message:

Modifs code BaseDataTable , DataTable et SwPPFDataTable pour la prise en compte
de colonnes de type complex (complex<r_4> ComplexField et complex<r_8> DoubleComplexField ) Reza , 2 Nov 2005

File:

• trunk/SophyaLib/HiStats/basedtable.cc (modified) (10 diffs)

trunk/SophyaLib/HiStats/basedtable.cc

@@ -44 +44 @@
     break;
   case DateField :
-    if (fgl) rs = "Date";
-    else rs = "Date";
+    if (fgl) rs = "DateTime";
+    else rs = "T";
     break;
   default:
@@ -156 +156 @@
   for(sa_size_t k=0; k<mDColsP.size(); k++) 
     mDColsP[k]->GetSegment(bid)[off] = data[mDColIdx[k]];
+  for(sa_size_t k=0; k<mYColsP.size(); k++) 
+    mYColsP[k]->GetSegment(bid)[off] = complex<r_4>(data[mYColIdx[k]],0.);
+  for(sa_size_t k=0; k<mZColsP.size(); k++) 
+    mZColsP[k]->GetSegment(bid)[off] = complex<r_8>(data[mZColIdx[k]],0.);
   for(sa_size_t k=0; k<mSColsP.size(); k++) 
     mSColsP[k]->GetSegment(bid)[off] = (string)MuTyV(data[mSColIdx[k]]);
@@ -190 +194 @@
   for(sa_size_t k=0; k<mDColsP.size(); k++) 
     mDColsP[k]->GetSegment(bid)[off] = (r_8)data[mDColIdx[k]];
+  for(sa_size_t k=0; k<mYColsP.size(); k++) 
+    mYColsP[k]->GetSegment(bid)[off] = 
+      complex<r_4>(data[mYColIdx[k]].GetRealPart(), data[mYColIdx[k]].GetImagPart());
+  for(sa_size_t k=0; k<mZColsP.size(); k++) 
+    mZColsP[k]->GetSegment(bid)[off] = 
+      complex<r_8>(data[mZColIdx[k]].GetRealPart(), data[mZColIdx[k]].GetImagPart());
 
   mNEnt++;
@@ -205 +215 @@
   for(sa_size_t k=0; k<mDColsP.size(); k++)     
     mDColsP[k]->Extend();
+  for(sa_size_t k=0; k<mYColsP.size(); k++) 
+    mYColsP[k]->Extend();
+  for(sa_size_t k=0; k<mZColsP.size(); k++) 
+    mZColsP[k]->Extend();
   for(sa_size_t k=0; k<mSColsP.size(); k++) 
     mSColsP[k]->Extend();
@@ -228 +242 @@
   for(sa_size_t k=0; k<mDColsP.size(); k++) 
     mVarMTV[mDColIdx[k]] = mDColsP[k]->GetCstSegment(bid)[off];
+  for(sa_size_t k=0; k<mYColsP.size(); k++) 
+    mVarMTV[mYColIdx[k]] = mYColsP[k]->GetCstSegment(bid)[off];
+  for(sa_size_t k=0; k<mZColsP.size(); k++) 
+    mVarMTV[mZColIdx[k]] = mZColsP[k]->GetCstSegment(bid)[off];
   for(sa_size_t k=0; k<mSColsP.size(); k++) 
     mVarMTV[mSColIdx[k]] = atof(mSColsP[k]->GetCstSegment(bid)[off].c_str());
@@ -336 +354 @@
   for(sa_size_t k=0; k<mDColsP.size(); k++) 
     mVarD[mDColIdx[k]] = mDColsP[k]->GetCstSegment(bid)[off];
+  for(sa_size_t k=0; k<mYColsP.size(); k++) 
+    mVarD[mYColIdx[k]] = mYColsP[k]->GetCstSegment(bid)[off].real();
+  for(sa_size_t k=0; k<mZColsP.size(); k++) 
+    mVarD[mZColIdx[k]] = mZColsP[k]->GetCstSegment(bid)[off].real();
   for(sa_size_t k=0; k<mSColsP.size(); k++) 
     mVarD[mSColIdx[k]] = atof(mSColsP[k]->GetCstSegment(bid)[off].c_str());
@@ -366 +388 @@
     break;
   case DoubleField :
-    rv = mDColsP[sk]->GetCstSegment(bid)[off];
+  case DateField :
+   rv = mDColsP[sk]->GetCstSegment(bid)[off];
+    break;
+  case ComplexField :
+    rv = mYColsP[sk]->GetCstSegment(bid)[off].real();
+    break;
+  case DoubleComplexField :
+    rv = mZColsP[sk]->GetCstSegment(bid)[off].real();
     break;
   case StringField :
@@ -407 +436 @@
     rv = mDColsP[sk]->GetCstSegment(bid)[off];
     break;
+  case ComplexField :
+    rv = mYColsP[sk]->GetCstSegment(bid)[off];
+    break;
+  case DoubleComplexField :
+    rv = mZColsP[sk]->GetCstSegment(bid)[off];
+    break;
   case StringField :
     rv = mSColsP[sk]->GetCstSegment(bid)[off];
@@ -482 +517 @@
         if (sp[n] > max) max = sp[n];
         if (sp[n] < min) min = sp[n];
+        cnt++;
+      }
+    }
+    break;
+  case ComplexField :
+    for(size_t is=0; is<mYColsP[sk]->NbSegments(); is++) {
+      const complex<r_4> * sp = mYColsP[sk]->GetCstSegment(is);
+      for(size_t n=0; n<mYColsP[sk]->SegmentSize(); n++) {
+        if (cnt >= NEntry())  break;
+        if (sp[n].real() > max) max = sp[n].real();
+        if (sp[n].real() < min) min = sp[n].real();
+        cnt++;
+      }
+    }
+    break;
+  case DoubleComplexField :
+    for(size_t is=0; is<mZColsP[sk]->NbSegments(); is++) {
+      const complex<r_8> * sp = mZColsP[sk]->GetCstSegment(is);
+      for(size_t n=0; n<mZColsP[sk]->SegmentSize(); n++) {
+        if (cnt >= NEntry())  break;
+        if (sp[n].real() > max) max = sp[n].real();
+        if (sp[n].real() < min) min = sp[n].real();
         cnt++;
       }
@@ -583 +640 @@
       rv = mDColsP[sk]->GetCstSegment(bid)[off];
       break;
+    case ComplexField :
+      rv = mYColsP[sk]->GetCstSegment(bid)[off];
+      break;
+    case DoubleComplexField :
+      rv = mZColsP[sk]->GetCstSegment(bid)[off];
+      break;
     case StringField :
       rv = mSColsP[sk]->GetCstSegment(bid)[off];