Changeset 2617

Timestamp:

08/01/12 17:40:15 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2825

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: not available

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Minor refactoring.

Location:

trunk/src

Files:

• EdgeMarker.cpp (modified) (2 diffs)
• GenericEdgeDetector.cpp (modified) (10 diffs)
• GenericEdgeDetector.h (modified) (1 diff)

trunk/src/EdgeMarker.cpp

@@ -72 +72 @@
 
   // exclude WVR
-  vector<uInt> wvr ;
+  Block<uInt> wvr( st_->getIFNos().size() ) ;
+  uInt n = 0 ;
   {
     ROArrayColumn<uChar> flagCol( st_->table(), "FLAGTRA" ) ;
@@ -82 +83 @@
       uInt nchan = flagCol( firstRow ).nelements() ;
       if ( nchan == 4 ) 
-        wvr.push_back( current ) ;
+        wvr[n++] = current ;
       iter.next() ;
     }
   }
-  wvr_ = Vector<uInt>( wvr ) ;
+  wvr_.takeStorage( IPosition(1,n), wvr.storage(), COPY ) ;
 
   if ( wvr_.nelements() > 0 ) {

trunk/src/GenericEdgeDetector.cpp

@@ -215 +215 @@
   const uInt maxiter = 100 ;
   while ( n > 0 && niter < maxiter ) {
-    n = _labeling( apix_ ) ;
+    n = _labeling() ;
     os_ << LogIO::DEBUGGING
         << "cycle " << niter << ": labeled " << n << " pixels" << LogIO::POST ;
@@ -226 +226 @@
 }
 
-uInt GenericEdgeDetector::_labeling( Matrix<uInt> &a )
+uInt GenericEdgeDetector::_labeling()
 {
   uInt n = 0 ;
   for ( uInt ix = 0 ; ix < nx_ ; ix++ ) {
-    Vector<uInt> v( a.row( ix ) ) ;
+    Vector<uInt> v( apix_.row( ix ) ) ;
     uInt nx = __labeling( v ) ;
     n += nx ;
   }
   for ( uInt iy = 0 ; iy < ny_ ; iy++ ) {
-    Vector<uInt> v( a.column( iy ) ) ;
+    Vector<uInt> v( apix_.column( iy ) ) ;
     uInt ny = __labeling( v ) ;
     n += ny ;
@@ -290 +290 @@
   if ( !elongated_ ) {
     while ( n < nTrim && niter < maxiter ) {
-      uInt m = _trimming( apix_ ) ;
+      uInt m = _trimming() ;
       os_ << LogIO::DEBUGGING
           << "cycle " << niter << ": trimmed " << m << " pixels" << LogIO::POST ;
@@ -300 +300 @@
     os_ << "1D triming along x-axis" << LogIO::POST ;
     while ( n < nTrim && niter < maxiter ) {
-      uInt m = _trimming1DX( apix_ ) ;
+      uInt m = _trimming1DX() ;
       os_ << LogIO::DEBUGGING
           << "cycle " << niter << ": trimmed " << m << " pixels" << LogIO::POST ;
@@ -310 +310 @@
     os_ << "1D triming along y-axis" << LogIO::POST ;
     while ( n < nTrim && niter < maxiter ) {
-      uInt m = _trimming1DY( apix_ ) ;
+      uInt m = _trimming1DY() ;
       os_ << LogIO::DEBUGGING
           << "cycle " << niter << ": trimmed " << m << " pixels" << LogIO::POST ;
@@ -326 +326 @@
 }
 
-uInt GenericEdgeDetector::_trimming( Matrix<uInt> &a ) 
-{
-  uInt n = 0 ;
-  const uInt nx = a.nrow() ;
-  const uInt ny = a.ncolumn() ;
-  Block<uInt> flatIdxList( a.nelements() ) ;
+uInt GenericEdgeDetector::_trimming() 
+{
+  uInt n = 0 ;
+  Block<uInt> flatIdxList( apix_.nelements() ) ;
   uInt start ;
   uInt end ;
   uInt flatIdx ;
-  for ( uInt ix = 0 ; ix < nx ; ix++ ) {
-    Vector<uInt> v( a.row( ix ) ) ;
+  for ( uInt ix = 0 ; ix < nx_ ; ix++ ) {
+    Vector<uInt> v( apix_.row( ix ) ) ;
     if ( allEQ( v, (uInt)0 ) ) {
       continue ;
     }
     _search( start, end, v ) ;
-    uInt offset = start * nx ;
+    uInt offset = start * nx_ ;
     flatIdx = offset + ix ;
     flatIdxList[n++] = flatIdx ;
     if ( start != end ) {
-      offset = end * nx ;
+      offset = end * nx_ ;
       flatIdx = offset + ix ;
       flatIdxList[n++] = flatIdx ;
     }
   }
-  for ( uInt iy = 0 ; iy < ny ; iy++ ) {
-    Vector<uInt> v( a.column( iy ) ) ;
+  for ( uInt iy = 0 ; iy < ny_ ; iy++ ) {
+    Vector<uInt> v( apix_.column( iy ) ) ;
     if ( allEQ( v, (uInt)0 ) ) {
       continue ;
     }
-    uInt offset = iy * nx ;
+    uInt offset = iy * nx_ ;
     _search( start, end, v ) ;
     flatIdx = offset + start ;
@@ -368 +366 @@
                Sort::Ascending,
                Sort::QuickSort | Sort::NoDuplicates ) ;
-  Vector<uInt> v( IPosition(1,nx*ny), a.data(), SHARE ) ; 
+  Vector<uInt> v( IPosition(1,apix_.nelements()), apix_.data(), SHARE ) ; 
   const uInt *idx_p = flatIdxList.storage() ;
   for ( uInt i = 0 ; i < n ; i++ ) {
@@ -378 +376 @@
 }
 
-uInt GenericEdgeDetector::_trimming1DX( Matrix<uInt> &a )
-{
-  uInt n = 0 ;
-  const uInt nx = a.nrow() ;
+uInt GenericEdgeDetector::_trimming1DX()
+{
+  uInt n = 0 ;
+  const uInt nx = apix_.nrow() ;
   Vector<uInt> v1, v2 ;
   uInt ix, jx ;
-  for ( ix = 0 ; ix < nx ; ix++ ) {
-    v1.reference( a.row( ix ) ) ;
+  for ( ix = 0 ; ix < nx_ ; ix++ ) {
+    v1.reference( apix_.row( ix ) ) ;
     if ( anyNE( v1, n ) ) break ;
   }
   for ( jx = nx-1 ; jx > ix ; jx-- ) {
-    v2.reference( a.row( jx ) ) ;
+    v2.reference( apix_.row( jx ) ) ;
     if ( anyNE( v2, n ) ) break ;
   }
@@ -399 +397 @@
 }
 
-uInt GenericEdgeDetector::_trimming1DY( Matrix<uInt> &a )
-{
-  uInt n = 0 ;
-  const uInt ny = a.ncolumn() ;
+uInt GenericEdgeDetector::_trimming1DY()
+{
+  uInt n = 0 ;
+  const uInt ny = apix_.ncolumn() ;
   Vector<uInt> v1, v2 ;
   uInt iy, jy ;
-  for ( iy = 0 ; iy < ny ; iy++ ) {
-    v1.reference( a.column( iy ) ) ;
+  for ( iy = 0 ; iy < ny_ ; iy++ ) {
+    v1.reference( apix_.column( iy ) ) ;
     if ( anyNE( v1, n ) ) break ;
   }
   for ( jy = ny-1 ; jy > iy ; jy-- ) {
-    v2.reference( a.column( jy ) ) ;
+    v2.reference( apix_.column( jy ) ) ;
     if ( anyNE( v2, n ) ) break ;
   }
@@ -462 +460 @@
     return ;
 
-  Vector<uInt> diff( len-1 ) ;
+  Block<uInt> diff( len-1 ) ;
   for ( uInt i = 0 ; i < len-1 ; i++ ) {
     diff[i] = off_[i+1] - off_[i] ;

trunk/src/GenericEdgeDetector.h

@@ -43 +43 @@
   // internal methods
   void setup() ;
-  casa::uInt _labeling( casa::Matrix<casa::uInt> &a ) ;
+  casa::uInt _labeling() ;
   casa::uInt __labeling( casa::Vector<casa::uInt> &a ) ;
-  casa::uInt _trimming( casa::Matrix<casa::uInt> &a ) ;
-  casa::uInt _trimming1DX( casa::Matrix<casa::uInt> &a ) ;
-  casa::uInt _trimming1DY( casa::Matrix<casa::uInt> &a ) ;
+  casa::uInt _trimming() ;
+  casa::uInt _trimming1DX() ;
+  casa::uInt _trimming1DY() ;
   casa::uInt _trimming1D( casa::Vector<casa::uInt> &a ) ;
   void _search( casa::uInt &start,