Changeset 2458

Timestamp:

04/06/12 14:55:14 (13 years ago)

Author:

KohjiNakamura

Message:

make CustomTableExprNode versatile

Location:

branches/hpc33/src

Files:

• Accelerator.h (added)
• STMath.cpp (modified) (2 diffs)

branches/hpc33/src/STMath.cpp

@@ -53 +53 @@
 #include "STMath.h"
 #include "STSelector.h"
+#include "Accelerator.h"
 
 using namespace casa;
 using namespace asap;
 
-class TableExprPredicate {
-public:
-        virtual ~TableExprPredicate() {}
-        virtual Bool match(Table const& table, const TableExprId& id) const = 0;
-};
-
-class CustomTableExprNodeRep :public TableExprNodeRep {
-        TableExprPredicate const & pred_;
-public:
-        CustomTableExprNodeRep(const Table &table,
-                TableExprPredicate const & pred)
-        :TableExprNodeRep(TableExprNodeRep::NTBool,
-                TableExprNodeRep::VTScalar,
-                TableExprNodeRep::OtUndef,
-                table),
-         pred_(pred) {}
-        virtual Bool getBool(const TableExprId& id) {
-                return pred_.match(table(), id);
-        }
-};
-
-class CustomTableExprNode: public TableExprNode {
-        CustomTableExprNodeRep nodeRep;
-public:
-        CustomTableExprNode(Table const &table, TableExprPredicate const &pred)
-        : nodeRep(table, pred), TableExprNode(&nodeRep) {
-        }
-        virtual ~CustomTableExprNode() {
-        }
-};
-
-template<typename T, size_t N>
-class MyPredicate: public TableExprPredicate {
-        Table const & table;
-        ROScalarColumn<T> *cols[N];
-        uInt const *values;
-public:
-        virtual ~MyPredicate() {
-                for (size_t i = 0; i < N; i++) {
-                        delete cols[i];
-                }
-        }
-        MyPredicate(Table const &table_, 
-                char const*const colNames[],
-                uInt const values_[]):
-                        table(table_), values(values_) {
-                for (size_t i = 0; i < N; i++) {
-                        cols[i] = new ROScalarColumn<T>(table, colNames[i]);
-                }
-        }
-        virtual Bool match(Table const& table, const TableExprId& id) const {
-                for (size_t i = 0; i < N; i++) {
-                        T v;
-                        cols[i]->get(id.rownr(), v);
-                        if (v != values[i]) {
-                                return false;
-                        }
-                }
-                return true;
-        }
-};
 
 // 2012/02/17 TN
@@ -280 +220 @@
       static char const*const colNames1[] = { "BEAMNO", "IFNO", "POLNO" };
       uInt const values1[] = { rec.asuInt("BEAMNO"), rec.asuInt("IFNO"), rec.asuInt("POLNO") };
-      MyPredicate<uInt, 3> myPred(tin, colNames1, values1);
+      SingleTypeEqPredicate<uInt, 3> myPred(tin, colNames1, values1);
       CustomTableExprNode myExpr(tin, myPred);
       Table basesubt = tin(myExpr);