Changeset 3520 in Sophya

Timestamp:

Sep 11, 2008, 2:45:01 PM (17 years ago)

Author:

ansari

Message:

Ajout/codage methode P2DArrayAdapter::MeanVal() pour les classes adapter heritant de P2DArrayAdapter, Reza 11/09/2008

Location:

trunk/SophyaPI/PIext

Files:

• nomskymapadapter.cc (modified) (2 diffs)
• phistwrapper.h (modified) (1 diff)
• pihisto2d.cc (modified) (1 diff)
• pimgadapter.h (modified) (1 diff)
• pitvmaad.cc (modified) (2 diffs)
• pitvmaad.h (modified) (1 diff)

trunk/SophyaPI/PIext/nomskymapadapter.cc

@@ -33 +33 @@
   virtual       ~LocalMapArrAdapter() { if (ad) delete map; }
   virtual double  Value(int ix, int iy) { return((*map)(ix, iy)); }
+  virtual double  MeanVal(int ix1, int ix2, int jy1, int jy2)
+  {
+  int ec;
+  if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+  if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+  double ss = 0.;
+  for(int j=jy1; j<=jy2; j++) 
+    for(int i=ix1; i<=ix2; i++)  ss += (double)((*map)(i, j));
+  ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+  return ss;  
+  }   
 
 protected :
@@ -56 +67 @@
 im = (*map)(iy, ix).imag();
 return(sqrt(re*re+im*im));
+}
+
+/* --Methode-- */
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+double LocalMapArrAdapter< complex<float> >::MeanVal(int ix1, int ix2, int jy1, int jy2)
+{
+int ec;
+if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+complex<float> ss = 0.;
+for(int j=jy1; j<=jy2; j++) 
+  for(int i=ix1; i<=ix2; i++)  ss += (*map)(i, j);
+ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+return sqrt(ss.real()*ss.real()+ss.imag()*ss.imag());  
+}
+
+/* --Methode-- */
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+double LocalMapArrAdapter< complex<double> >::MeanVal(int ix1, int ix2, int jy1, int jy2)
+{
+int ec;
+if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+complex<double> ss = 0.;
+for(int j=jy1; j<=jy2; j++) 
+  for(int i=ix1; i<=ix2; i++)  ss += (*map)(i, j);
+ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+return sqrt(ss.real()*ss.real()+ss.imag()*ss.imag());  
 }
 

trunk/SophyaPI/PIext/phistwrapper.h

@@ -99 +99 @@
   // Identique a l'operateur ()(i)
   virtual double Value(int i, int j) { return (*this)(i, j); }
+  // Calcule la moyenne des bins entre (ix1,jy1) <= (ix2, jy2)
+  virtual double MeanVal(int ix1, int ix2, int jy1, int jy2);
 
   // Methode de mise a jour du contenu 

trunk/SophyaPI/PIext/pihisto2d.cc

@@ -23 +23 @@
 P2DHistoWrapper::~P2DHistoWrapper()
 {
+}
+
+
+double P2DHistoWrapper::MeanVal(int ix1, int ix2, int jy1, int jy2)
+{
+  int ec;
+  if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+  if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+  double ss = 0.;
+  for(int j=jy1; j<=jy2; j++) 
+    for(int i=ix1; i<=ix2; i++)  ss += (double)((*this)(i, j));
+  ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+  return ss;     
 }
 

trunk/SophyaPI/PIext/pimgadapter.h

@@ -32 +32 @@
   virtual         ~ImageAdapter() { if (aDel) delete mImg; }
   virtual double  Value(int ix, int iy) { return((*mImg)(ix, iy)); }
+  virtual double  MeanVal(int ix1, int ix2, int jy1, int jy2)  
+    {
+    int ec;
+    if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+    if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+    double ss = 0.;
+    for(int j=jy1; j<=jy2; j++) 
+      for(int i=ix1; i<=ix2; i++)  ss += (double)((*mImg)(i, j));
+    ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+    return ss;  
+    }   
 
 protected :

trunk/SophyaPI/PIext/pitvmaad.cc

@@ -71 +71 @@
 
 /* --Methode-- */
+template <class T> 
+double POTMatrixAdapter<T>::MeanVal(int ix1, int ix2, int jy1, int jy2)
+{
+int ec;
+if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+double ss = 0.;
+for(int j=jy1; j<=jy2; j++) 
+  for(int i=ix1; i<=ix2; i++)  ss += (double)((*mMtx)(j, i));
+ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+return ss;  
+}   
+
+
+/* --Methode-- */
 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
 double POTMatrixAdapter< complex<float> >::Value(int ix, int iy)
@@ -89 +104 @@
 return(sqrt(re*re+im*im));
 }
+
+/* --Methode-- */
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+double POTMatrixAdapter< complex<float> >::MeanVal(int ix1, int ix2, int jy1, int jy2)
+{
+int ec;
+if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+complex<float> ss = 0.;
+for(int j=jy1; j<=jy2; j++) 
+  for(int i=ix1; i<=ix2; i++)  ss += (*mMtx)(j, i);
+ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+return sqrt(ss.real()*ss.real()+ss.imag()*ss.imag());  
+}   
+
+/* --Methode-- */
+DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
+double POTMatrixAdapter< complex<double> >::MeanVal(int ix1, int ix2, int jy1, int jy2)
+{
+int ec;
+if (ix1>ix2) { ec=ix1; ix1=ix2; ix2=ec; }
+if (jy1>jy2) { ec=jy1; jy1=jy2; jy2=ec; }    
+complex<double> ss = 0.;
+for(int j=jy1; j<=jy2; j++) 
+  for(int i=ix1; i<=ix2; i++)  ss += (*mMtx)(j, i);
+ss /= (double)((jy2-jy1+1)*(ix2-ix1+1));
+return sqrt(ss.real()*ss.real()+ss.imag()*ss.imag());  
+}   
 
 #ifdef __CXX_PRAGMA_TEMPLATES__

trunk/SophyaPI/PIext/pitvmaad.h

@@ -38 +38 @@
   virtual         ~POTMatrixAdapter();
   virtual double  Value(int ix, int iy);
+  virtual double  MeanVal(int ix1, int ix2, int jy1, int jy2);
 
 protected: