Changeset 2470 for branches

Timestamp:

04/18/12 15:19:39 (13 years ago)

Author:

KohjiNakamura

Message:

bug fix

Location:

branches/hpc33/src

Files:

• Accelerator.h (modified) (3 diffs)
• STMath.cpp (modified) (1 diff)

branches/hpc33/src/Accelerator.h

@@ -13 +13 @@
 //
 
+#include <casa/Utilities/Assert.h>
 #include <tables/Tables/ExprNode.h>
 #include <tables/Tables/ScalarColumn.h>
@@ -20 +21 @@
 using namespace casa;
 
+class TableExprPredicate {
+public:
+        virtual ~TableExprPredicate() {}
+        virtual Bool match(Table const& table, const TableExprId& id) = 0;
+};
+
 class CustomTableExprNodeRep :public TableExprNodeRep {
+        TableExprPredicate & pred_;
 public:
-        CustomTableExprNodeRep(const Table &table)
+        CustomTableExprNodeRep(const Table &table,
+                TableExprPredicate & pred)
         :TableExprNodeRep(TableExprNodeRep::NTBool,
                 TableExprNodeRep::VTScalar,
                 TableExprNodeRep::OtUndef,
-                table) {}
-};
-
-class TableExprPredicate {
-public:
-        virtual ~TableExprPredicate() {}
-        virtual Bool match(Table const& table, const TableExprId& id) const = 0;
+                table),
+        pred_(pred) {}
+        virtual ~CustomTableExprNodeRep() {}
+        virtual Bool getBool(const TableExprId& id) {
+                return pred_.match(table(), id);
+        }
 };
 
 class CustomTableExprNode: public TableExprNode {
-        CustomTableExprNodeRep const nodeRep;
-        TableExprPredicate const & pred_;
 public:
-        CustomTableExprNode(Table const &table, TableExprPredicate const &pred)
-        : TableExprNode(), nodeRep(table), pred_(pred) {
+        CustomTableExprNode(CustomTableExprNodeRep &nodeRep)
+        : TableExprNode(&nodeRep) {
         }
         virtual ~CustomTableExprNode() {
-        }
-        const TableExprNodeRep* getNodeRep() const {
-                return &nodeRep;
-        }
-        void get(const TableExprId& id, Bool& value) const {
-                value = pred_.match(nodeRep.table(), id);
         }
 };
@@ -71 +71 @@
                 }
         }
-        virtual Bool match(Table const& table, const TableExprId& id) const {
+        virtual Bool match(Table const& table, const TableExprId& id) {
+                DebugAssert(&table == &this->table, AipsError);
                 for (size_t i = 0; i < N; i++) {
                         T v;

branches/hpc33/src/STMath.cpp

@@ -221 +221 @@
       uInt const values1[] = { rec.asuInt("IFNO"), rec.asuInt("BEAMNO"), rec.asuInt("POLNO") };
       SingleTypeEqPredicate<uInt, 3> myPred(tin, colNames1, values1);
-      CustomTableExprNode myExpr(tin, myPred);
+      CustomTableExprNodeRep myNodeRep(tin, myPred);
+      myNodeRep.link(); // to avoid automatic delete when myExpr is destructed.
+      CustomTableExprNode myExpr(myNodeRep);
       Table basesubt = tin(myExpr);
+cout << "CustomTableExprNode selected row number is " << basesubt.nrow() << "/" << tin.nrow() << endl;
 #else
       Table basesubt = tin( tin.col("BEAMNO") == Int(rec.asuInt("BEAMNO"))