Changeset 2708 in Sophya

Timestamp:

Apr 28, 2005, 7:33:16 PM (20 years ago)

Author:

cmv

Message:

• intro de v/sort
• acceleration lecture fichiers ASCII n/read

cmv 28/04/05

File:

• trunk/SophyaPI/PIext/pawexecut.cc (modified) (9 diffs)

trunk/SophyaPI/PIext/pawexecut.cc

@@ -30 +30 @@
 
 /* Reza + cmv  13/10/99 */
+
+inline bool __vector_sort_up_r8(r_8 x1,r_8 x2) {return x1<x2;}
+inline bool __vector_sort_down_r8(r_8 x1,r_8 x2) {return x1>x2;}
+inline bool __vector_sort_up_r4(r_4 x1,r_4 x2) {return x1<x2;}
+inline bool __vector_sort_down_r4(r_4 x1,r_4 x2) {return x1>x2;}
+inline bool __vector_sort_up_i4(int_4 x1,int_4 x2) {return x1<x2;}
+inline bool __vector_sort_down_i4(int_4 x1,int_4 x2) {return x1>x2;}
+inline bool __vector_sort_up_u8(uint_8 x1,uint_8 x2) {return x1<x2;}
+inline bool __vector_sort_down_u8(uint_8 x1,uint_8 x2) {return x1>x2;}
 
 uint_4 PAWExecutor::autoc_counter_ = 0;
@@ -117 +126 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
-//#ifndef SANS_EVOLPLANCK
 kw = "v/integ";
 usage = "Integrate a TVector / vector";
@@ -124 +132 @@
 usage += "\n  Related commands: h/integ h/deriv v/deriv";
 piac->RegisterCommand(kw,usage,this,hgrp);
-//#endif
+
+kw = "v/sort";
+usage = "Sort a vector into itself";
+usage += "\n v/sort namevec [+1/-1]";
+usage += "\n \"+1\" means increasing order, \"-1\" decreasing order";
+piac->RegisterCommand(kw,usage,this,hgrp);
 
 kw = "h/deriv";
@@ -132 +145 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
-//#ifndef SANS_EVOLPLANCK
 kw = "v/deriv";
 usage = "Derivate a TVector / vector";
@@ -141 +153 @@
 usage += "\n  Related commands: h/integ h/deriv v/integ";
 piac->RegisterCommand(kw,usage,this,hgrp);
-//#endif
 
 kw = "h/rebin";
@@ -274 +285 @@
 } else if(kw == "h/integ") {
   h_integ(tokens); return(0);
-  //#ifndef SANS_EVOLPLANCK
 } else if(kw == "v/integ") {
   v_integ(tokens); return(0);
-  //#endif
+} else if(kw == "v/sort") {
+  v_sort(tokens); return(0);
 } else if(kw == "h/deriv") {
   h_deriv(tokens); return(0);
-  //#ifndef SANS_EVOLPLANCK
 } else if(kw == "v/deriv") {
   v_deriv(tokens); return(0);
-  //#endif
 } else if(kw == "h/rebin") {
   h_rebin(tokens); return(0);
@@ -737 +746 @@
      {line[lc-1]='\0'; lc = strlen(line); if(lc<1) continue;}
 
-   // On vire les blancs au debut et a la fin
-   char *newline = line;
-   for(int i=0;i<lc;i++) if(newline[i]!=' ') {newline = &line[i]; break;}
-   lc = strlen(newline); if(lc<1) continue;
-   for(int i=lc-1;i>=0;i--) if(newline[i]==' ') newline[i]='\0'; else break;
-   lc = strlen(newline); if(lc<1) continue;
-   string const sline(newline);
+   string const sline(line);
    //cout<<"\'"<<sline<<"\'  lc="<<lc<<endl;
 
@@ -790 +793 @@
    // Decodage de la ligne
    vector<string> vs;
-   FillVStringFrString(sline,vs,separator);
+   //FillVStringFrString(sline,vs,separator);
+   SplitStringToVString(sline,vs,separator);
    int lvs = vs.size();
+   //for(int i=0;i<lvs;i++) cout<<"|"<<vs[i]<<"| "; cout<<endl;
    if(lvs<numcolmaxi) continue; // Pas assez de champs decodes, mauvaise ligne
 
@@ -954 +959 @@
 norm /= (*v)(n-1);
 for(uint_4 i=0;i<n;i++) (*v)(i) *= norm;
+}
+
+/* methode */
+void PAWExecutor::v_sort(vector<string>& tokens)
+// Pour sort in-place d'un vecteur ascendant ou descendant
+{
+ if(tokens.size()<1)
+   {cout<<"Usage: v/sort namevec [+1/-1]"<<endl; return;}
+ NamedObjMgr omg;
+ AnyDataObj* mobj = omg.GetObj(tokens[0]);
+ if(mobj==NULL)
+   {cout<<"PAWExecutor::v_sort Error: unknow object"<<tokens[0]<<endl;
+   return;}
+
+ bool up = true;
+ if(tokens.size()>=2) if(atoi(tokens[1].c_str())<0) up=false;
+
+ {
+ TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
+ if(v) {
+   if(v->Size()==0) return;
+   if(up) stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_up_r8);
+     else stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_down_r8);
+   cout<<"median is: "<<0.5*((*v)(v->Size()/2)+(*v)((v->Size()-1)/2))<<endl;
+   return;
+ }
+ }
+
+ {
+ TVector<r_4>* v = dynamic_cast<TVector<r_4>*>(mobj);
+ if(v) {
+   if(v->Size()==0) return;
+   if(up) stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_up_r4);
+     else stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_down_r4);
+   cout<<"median is: "<<0.5*((*v)(v->Size()/2)+(*v)((v->Size()-1)/2))<<endl;
+   return;
+ }
+ }
+
+ {
+ TVector<int_4>* v = dynamic_cast<TVector<int_4>*>(mobj);
+ if(v) {
+   if(v->Size()==0) return;
+   if(up) stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_up_i4);
+     else stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_down_i4);
+   cout<<"median is: "<<0.5*((*v)(v->Size()/2)+(*v)((v->Size()-1)/2))<<endl;
+   return;
+ }
+ }
+
+ {
+ TVector<uint_8>* v = dynamic_cast<TVector<uint_8>*>(mobj);
+ if(v) {
+   if(v->Size()==0) return;
+   if(up) stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_up_u8);
+     else stable_sort(v->Data(), v->Data()+v->Size(), __vector_sort_down_u8);
+   cout<<"median is: "<<0.5*((*v)(v->Size()/2)+(*v)((v->Size()-1)/2))<<endl;
+   return;
+ }
+ }
+
+ cout<<"PAWExecutor::v_sort Error: "<<tokens[0]
+     <<" not a TVector or not a supported TVector<TYPE>"<<endl;
+ return;
+
 }