Changeset 2597 for branches

Timestamp:

07/11/12 18:26:56 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Use Block instead of Matrix to store processed pair of
(feedId,spwId) and (polId,spwId) for addFeed and addDataDescription.

File:

• branches/hpc34/src/MSWriter.cpp (modified) (5 diffs)

branches/hpc34/src/MSWriter.cpp

@@ -994 +994 @@
   {
     Int idx = -1 ;
-    uInt nEntry = ddEntry.nrow() ;
-    Vector<Int> key( 2 ) ;
-    key[0] = pid ;
-    key[1] = sid ;
+    uInt nItem = 2 ;
+    uInt len = ddEntry.nelements() ;
+    uInt nEntry = len / nItem ;
+    const Int *dd_p = ddEntry.storage() ;
     for ( uInt i = 0 ; i < nEntry ; i++ ) {
-      if ( allEQ( ddEntry.row(i), key ) ) {
+      Int pol = *dd_p ;
+      dd_p++ ;
+      Int spw = *dd_p ;
+      dd_p++ ;
+      if ( pid == pol && sid == spw ) {
         idx = i ;
         break ;
@@ -1015 +1019 @@
       idx = nrow ;
 
-      ddEntry.resize( nEntry+1, 2, True ) ;
-      ddEntry.row(nEntry) = key ;
+      ddEntry.resize( len+nItem ) ;
+      ddEntry[len] = pid ;
+      ddEntry[len+1] = sid ;
     }
 
@@ -1087 +1092 @@
   {
     Int idx = -1 ;
-    uInt nEntry = feedEntry.nrow() ;
-    Vector<Int> key( 2 ) ;
-    key[0] = fid ;
-    key[1] = sid ;
+    uInt nItem = 2 ;
+    uInt len = feedEntry.nelements() ;
+    uInt nEntry = len / nItem ;
+    const Int *fe_p = feedEntry.storage() ;
     for ( uInt i = 0 ; i < nEntry ; i++ ) {
-      if ( allEQ( feedEntry.row(i), key ) ) {
+      Int feed = *fe_p ;
+      fe_p++ ;
+      Int spw = *fe_p ;
+      fe_p++ ;
+      if ( fid == feed && sid == spw ) {
         idx = i ;
         break ;
       }
     }
+
 
     if ( idx == -1 ) {
@@ -1133 +1143 @@
       tr.put( nrow ) ;
 
-      feedEntry.resize( nEntry+1, 2, True ) ;
-      feedEntry.row( nEntry ) = key ;
+      feedEntry.resize( len+nItem ) ;
+      feedEntry[len] = fid ;
+      feedEntry[len+1] = sid ;
     }
   }
@@ -1447 +1458 @@
 
   Vector<String> stateEntry;
-  Matrix<Int> ddEntry;
-  Matrix<Int> feedEntry;
+  Block<Int> ddEntry;
+  Block<Int> feedEntry;
   vector< Vector<Int> > polEntry;
   map<uInt,Bool> processedFreqId;