more tests are passing...

Author: Dilawar Singh

pybind11/Vec.hpp

@@ -18,7 +18,7 @@ class MooseVec {
 
 public:
     MooseVec(const string& path, size_t n = 1, const string& dtype = "Neutral")
-        : path_(path), n_(n), dtype_(dtype)
+        : path_(path)
     {
         if (!mooseExists(path)) {
             objs_.clear();
@@ -32,6 +32,12 @@ class MooseVec {
         }
     }
 
+    MooseVec(const ObjId& oid) : path_(oid.path())
+    {
+        for (size_t i = 0; i < oid.element()->numData(); i++)
+            objs_.push_back(ObjId(oid, i));
+    }
+
     size_t len()
     {
         return objs_.size();
@@ -64,15 +70,18 @@ class MooseVec {
     vector<py::object> getAttr(const string& name)
     {
         vector<py::object> res(objs_.size());
-        for (size_t i = 0; i < objs_.size(); i++) 
+        for (size_t i = 0; i < objs_.size(); i++)
             res[i] = getProperty(objs_[i], name);
         return res;
     }
 
+    const vector<ObjId>& objs() const
+    {
+        return objs_;
+    }
+
 private:
     std::string path_;
-    size_t n_;
-    const std::string dtype_;
     std::vector<ObjId> objs_;
 };
 

pybind11/helper.cpp

@@ -20,6 +20,7 @@
 #include "../external/pybind11/include/pybind11/pybind11.h"
 #include "../external/pybind11/include/pybind11/stl.h"
 #include "../external/pybind11/include/pybind11/numpy.h"
+#include "../external/pybind11/include/pybind11/functional.h"
 
 // See
 // https://pybind11.readthedocs.io/en/stable/advanced/cast/stl.html#binding-stl-containers
@@ -147,16 +148,19 @@ bool mooseExists(const string& path)
     return Id(path) != Id() || path == "/" || path == "/root";
 }
 
+ObjId mooseElement(const ObjId& oid)
+{
+    return oid;
+}
+
 ObjId mooseElement(const string& path)
 {
     ObjId oid(path);
     if (oid.bad()) {
-        throw runtime_error(std::string("moose_element: '") +
-                            std::string(path) +
-                            std::string("' does not exist!"));
+        cerr << "moose_element: " << path << " does not exist!" << endl;
         return ObjId(Id());
     }
-    return oid;
+    return mooseElement(oid);
 }
 
 ObjId loadModelInternal(const string& fname, const string& modelpath,
@@ -216,9 +220,14 @@ ObjId mooseConnect(const ObjId& src, const string& srcField, const ObjId& tgt,
     return pShell->doAddMsg("Single", src, srcField, tgt, tgtField);
 }
 
-void mooseDelete(const ObjId& oid)
+bool mooseDelete(const ObjId& oid)
 {
-    getShellPtr()->doDelete(oid);
+    return getShellPtr()->doDelete(oid);
+}
+
+bool mooseDelete(const string& path)
+{
+    return getShellPtr()->doDelete(ObjId(path));
 }
 
 ObjId mooseCreate(const string type, const string& path, size_t numdata)
@@ -390,15 +399,20 @@ py::object handleDestFinfo(const ObjId& obj, const string& fname)
     // return py::none();
 }
 
-py::object getPropertyDestFinfo(const ObjId& oid, const string& fname)
+py::cpp_function getPropertyDestFinfo(const ObjId& oid, const string& fname,
+                                      const Finfo* finfo)
 {
+    const auto rttType = finfo->rttiType();
 
     // Return function.
-    std::function<py::object(const string&)> func = [oid](const string& fname) {
-        return handleDestFinfo(oid, fname);
-    };
-    return py::cast(func);
+    cout << "ObjId " << oid << " -- " << fname << ": " << rttType << endl;
 
+    if (rttType == "void") {
+        std::function<py::object()> func = [oid, fname]() {
+            return handleDestFinfo(oid, fname);
+        };
+        return func;
+    }
 }
 
 py::object getProperty(const ObjId& oid, const string& fname)
@@ -423,7 +437,7 @@ py::object getProperty(const ObjId& oid, const string& fname)
         // Return function.
         return getLookupValueFinfo(oid, fname, finfo);
     } else if (finfoType == "DestFinfo") {
-        return getPropertyDestFinfo(oid, fname);
+        return getPropertyDestFinfo(oid, fname, finfo);
     }
 
     cerr << "NotImplemented: getProperty for " << fname << " with rttType "
@@ -441,13 +455,22 @@ py::object getLookupValueFinfoItem(const ObjId& oid, const string& fname,
     string tgtType = srcDestType[1];
 
     py::object r;
-    if (tgtType == "bool")
-        r = py::cast(LookupField<string, bool>::get(oid, fname, k));
-    else if (tgtType == "vector<Id>")
-        r = py::cast(LookupField<string, vector<Id>>::get(oid, fname, k));
-    else
-        cerr << "Unsupported types: " << rttType << endl;
-    return r;
+    if (srcType == "string") {
+        if (tgtType == "bool")
+            return py::cast(LookupField<string, bool>::get(oid, fname, k));
+        else if (tgtType == "vector<Id>")
+            return py::cast(
+                LookupField<string, vector<Id>>::get(oid, fname, k));
+        else if (tgtType == "vector<ObjId>")
+            return py::cast(
+                LookupField<string, vector<ObjId>>::get(oid, fname, k));
+        else
+            MOOSE_DEBUG("Unsupported types: " << rttType << " and " << tgtType);
+    }
+
+    MOOSE_DEBUG("Unsupported types: " << rttType << " src: " << srcType
+                                      << " and tgt:" << tgtType);
+    py::none();
 }
 
 py::object getLookupValueFinfo(const ObjId& oid, const string& fname,

pybind11/helper.h

@@ -28,6 +28,7 @@ Shell* getShellPtr();
 
 bool mooseExists(const string& path);
 
+ObjId mooseElement(const ObjId& oid);
 ObjId mooseElement(const string& path);
 
 ObjId loadModelInternal(const string& fname, const string& modelpath,
@@ -43,7 +44,8 @@ py::object getFieldGeneric(const ObjId& oid, const string& fname);
 ObjId mooseConnect(const ObjId& src, const string& srcField, const ObjId& tgt,
                    const string& tgtField);
 
-void mooseDelete(const ObjId& oid);
+bool mooseDelete(const ObjId& oid);
+bool mooseDelete(const string& path);
 
 ObjId mooseCreate(const string type, const string& path, size_t numdata = 1);
 
@@ -71,7 +73,8 @@ py::object handleDestFinfo(const ObjId& obj, const string& fname);
 
 py::object getValueFinfo(const ObjId& oid, const string& fname, const Finfo* f);
 
-py::object getPropertyDestFinfo(const ObjId& oid);
+py::cpp_function getPropertyDestFinfo(const ObjId& oid, const string& fname,
+                                      const Finfo* finfo);
 
 py::object getProperty(const ObjId& oid, const string& fname);
 

pybind11/pymoose.cpp

@@ -25,9 +25,9 @@
 #include "../external/pybind11/include/pybind11/pybind11.h"
 #include "../external/pybind11/include/pybind11/stl.h"
 
-// See
-// https://pybind11.readthedocs.io/en/stable/advanced/cast/stl.html#binding-stl-containers
-// #include "../external/pybind11/include/pybind11/stl_bind.h"
+// See https://pybind11.readthedocs.io/en/master/classes.html#overloaded-methods
+template <typename... Args>
+using overload_cast_ = pybind11::detail::overload_cast_impl<Args...>;
 
 #include "../basecode/global.h"
 #include "../basecode/header.h"
@@ -55,7 +55,6 @@ Id initModule(py::module& m)
     return initShell();
 }
 
-
 PYBIND11_MODULE(_cmoose, m)
 {
     m.doc() = R"moosedoc(moose module.)moosedoc";
@@ -135,7 +134,6 @@ PYBIND11_MODULE(_cmoose, m)
         * Attributes.
         */
         .def("__getattr__", &getProperty)
-        .def("__getattr__", &getPropertyDestFinfo)
         .def("__setattr__", &setProperty<double>)
         .def("__setattr__", &setProperty<vector<double>>)
         .def("__setattr__", &setProperty<std::string>)
@@ -186,12 +184,17 @@ PYBIND11_MODULE(_cmoose, m)
     py::class_<MooseVec>(m, "vec", py::dynamic_attr())
         .def(py::init<const string&, size_t, const string&>(), "path"_a,
              "n"_a = 1, "dtype"_a = "Neutral")  // Default
+        .def(py::init<const ObjId&>())
         .def("__len__", &MooseVec::len)
+        .def("__iter__",
+             [](const MooseVec& v) {
+                 return py::make_iterator(v.objs().begin(), v.objs().end());
+             },
+             py::keep_alive<0, 1>())
         .def("__getitem__", &MooseVec::getElem)
         .def("__setattr__", &MooseVec::setAttrOneToOne<double>)
         .def("__setattr__", &MooseVec::setAttrOneToAll<double>)
-        .def("__getattr__", &MooseVec::getAttr)
-        ;
+        .def("__getattr__", &MooseVec::getAttr);
 
     // Module functions.
     m.def("getShell",
@@ -202,11 +205,13 @@ PYBIND11_MODULE(_cmoose, m)
     m.def("rand", [](double a, double b) { return moose::mtrand(a, b); },
           "a"_a = 0, "b"_a = 1);
     m.def("wildcardFind", &wildcardFind2);
-    m.def("delete", &mooseDelete);
+    m.def("delete", overload_cast_<const ObjId&>()(&mooseDelete));
+    m.def("delete", overload_cast_<const string&>()(&mooseDelete));
     m.def("create", &mooseCreate);
     m.def("reinit", &mooseReinit);
     m.def("start", &mooseStart, "runtime"_a, "notify"_a = false);
-    m.def("element", &mooseElement);
+    m.def("element", overload_cast_<const ObjId&>()(&mooseElement));
+    m.def("element", overload_cast_<const string&>()(&mooseElement));
     m.def("exists", &mooseExists);
     m.def("connect", &mooseConnect);
     m.def("getCwe", &mooseGetCwe);

tests/pybind11/test_api.py

@@ -25,9 +25,16 @@ def test_other():
     finfo = moose.getFieldDict(a1.className)
     print(finfo)
 
+def test_vec():
+    a = moose.Pool('/p111', 100)
+    v = moose.vec(a)
+    for i, x in enumerate(v):
+        print(i, x)
+
 def main():
     test_children()
     test_other()
+    test_vec()
 
 if __name__ == '__main__':
     main()

tests/pybind11/test_shell.py

@@ -331,7 +331,7 @@ def test_ksolve2():
     kin = makereac2()
     run_and_assert(kin, "ksolve1_test2.png")
 
-def test_access():
+def test_other():
     moose.Neutral('x')
     a = moose.Neutral('x/x')
     print(a.isA)
@@ -351,7 +351,7 @@ def main():
     test_ksolve0()
     test_ksolve1()
     test_ksolve2()
-    test_access()
+    test_other()
 
 if __name__ == '__main__':
     main()