Perfect. One more test passes.

Dilawar Singh · Dilawar Singh · commit dd9b50e9db13 · 2020-04-01T17:59:50.000+05:30
diff --git a/pybind11/MooseVec.cpp b/pybind11/MooseVec.cpp
@@ -19,8 +19,9 @@ namespace py = pybind11;
 #include "pymoose.h"
 #include "MooseVec.h"
 
-MooseVec::MooseVec(const string& path, unsigned int n = 1, const string& dtype = "Neutral")
-: path_(path)
+MooseVec::MooseVec(const string& path, unsigned int n = 1,
+                   const string& dtype = "Neutral")
+    : path_(path)
 {
     if (!mooseExists(path)) {
         objs_.clear();
@@ -60,9 +61,14 @@ unsigned int MooseVec::len()
     return (unsigned int)size();
 }
 
-const ObjId& MooseVec::getItem(const size_t i) const
+const ObjId& MooseVec::getItemRef(const size_t i) const
 {
-    return objs_.at(i);
+    return objs_[i];
+}
+
+ObjId MooseVec::getItem(const size_t i) const
+{
+    return objs_[i];
 }
 
 void MooseVec::setAttrOneToAll(const string& name, const py::object& val)
@@ -72,12 +78,12 @@ void MooseVec::setAttrOneToAll(const string& name, const py::object& val)
 
 void MooseVec::setAttrOneToOne(const string& name, const py::sequence& val)
 {
-    if ( py::len(val) != objs_.size())
+    if (py::len(val) != objs_.size())
         throw runtime_error(
-                "Length of sequence on the right hand side "
-                "does not match size of vector. "
-                "Expected " +
-                to_string(objs_.size()) + ", got " + to_string(py::len(val)));
+            "Length of sequence on the right hand side "
+            "does not match size of vector. "
+            "Expected " +
+            to_string(objs_.size()) + ", got " + to_string(py::len(val)));
     for (size_t i = 0; i < objs_.size(); i++)
         setFieldGeneric(objs_[i], name, val[i]);
 }
@@ -94,3 +100,26 @@ const vector<ObjId>& MooseVec::objs() const
 {
     return objs_;
 }
+
+ObjId MooseVec::connectToSingle(const string& srcfield, const ObjId& tgt,
+                                const string& tgtfield, const string& msgtype)
+{
+    ObjId res;
+    for (const auto& obj : objs_)
+        res = mooseConnect(obj, srcfield, tgt, tgtfield, msgtype);
+    return res;
+}
+
+ObjId MooseVec::connectToVec(const string& srcfield, const MooseVec& tgt,
+                             const string& tgtfield, const string& msgtype)
+{
+    if (objs_.size() != tgt.size())
+        throw runtime_error(
+            "Length mismatch. Source vector size is " + to_string(size()) +
+            " but the target vector size is " + to_string(tgt.size()));
+
+    ObjId res;
+    for (size_t i = 0; i < size(); i++)
+        res = mooseConnect(objs_[i], srcfield, tgt.getItem(i), tgtfield, msgtype);
+    return res;
+}
diff --git a/pybind11/MooseVec.h b/pybind11/MooseVec.h
@@ -25,7 +25,8 @@ class MooseVec {
 
     unsigned int len();
 
-    const ObjId& getItem(const size_t i) const;
+    const ObjId& getItemRef(const size_t i) const;
+    ObjId getItem(const size_t i) const;
 
     void setAttrOneToAll(const string& name, const py::object& val);
 
@@ -35,6 +36,10 @@ class MooseVec {
 
     const vector<ObjId>& objs() const;
 
+    ObjId connectToSingle(const string& srcfield, const ObjId& tgt, const string& tgtfield, const string& msgtype);
+
+    ObjId connectToVec(const string& srcfield, const MooseVec& tgt, const string& tgtfield, const string& msgtype);
+
 private:
     std::string path_;
     std::vector<ObjId> objs_;
diff --git a/pybind11/helper.cpp b/pybind11/helper.cpp
@@ -214,10 +214,10 @@ ObjId getElementFieldItem(const ObjId& objid, const string& fname,
 }
 
 ObjId mooseConnect(const ObjId& src, const string& srcField, const ObjId& tgt,
-                   const string& tgtField)
+                   const string& tgtField, const string& msgType)
 {
     auto pShell = getShellPtr();
-    return pShell->doAddMsg("Single", src, srcField, tgt, tgtField);
+    return pShell->doAddMsg(msgType, src, srcField, tgt, tgtField);
 }
 
 bool mooseDelete(const ObjId& oid)
@@ -241,6 +241,11 @@ void mooseSetClock(const unsigned int clockId, double dt)
     getShellPtr()->doSetClock(clockId, dt);
 }
 
+void mooseUseClock(size_t tick, const string& path, const string& field)
+{
+    getShellPtr()->doUseClock(path,  field, tick);
+}
+
 /* --------------------------------------------------------------------------*/
 /**
  * @Synopsis  Current Working Element.
diff --git a/pybind11/helper.h b/pybind11/helper.h
@@ -42,7 +42,7 @@ ObjId getElementFieldItem(const ObjId& objid, const string& fname,
                           unsigned int index);
 
 ObjId mooseConnect(const ObjId& src, const string& srcField, const ObjId& tgt,
-                   const string& tgtField);
+                   const string& tgtField, const string& msgType);
 
 bool mooseDelete(const ObjId& oid);
 bool mooseDelete(const string& path);
@@ -56,6 +56,8 @@ py::object mooseGetCwe();
 
 void mooseSetClock(const unsigned int clockId, double dt);
 
+void mooseUseClock(size_t tick, const string& path, const string& field);
+
 map<string, string> mooseGetFieldDict(const string& className,
                                       const string& finfoType);
 
diff --git a/pybind11/pymoose.cpp b/pybind11/pymoose.cpp
@@ -20,17 +20,18 @@
 #include <utility>
 #include <vector>
 
-#include "../external/pybind11/include/pybind11/functional.h"
-#include "../external/pybind11/include/pybind11/numpy.h"
 #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"
+namespace py = pybind11;
 
 // 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"
+#include "../basecode/global.h"
 #include "../basecode/Cinfo.h"
 #include "../builtins/Variable.h"
 #include "../shell/Neutral.h"
@@ -46,17 +47,16 @@ using overload_cast_ = pybind11::detail::overload_cast_impl<Args...>;
 
 #include "pymoose.h"
 
-
 using namespace std;
-namespace py = pybind11;
 using namespace pybind11::literals;
 
 Id initModule(py::module& m)
 {
     return initShell();
 }
 
-bool setFieldGeneric(const ObjId& oid, const string& fieldName, const py::object& val)
+bool setFieldGeneric(const ObjId& oid, const string& fieldName,
+                     const py::object& val)
 {
     auto cinfo = oid.element()->cinfo();
     auto finfo = cinfo->findFinfo(fieldName);
@@ -66,30 +66,33 @@ bool setFieldGeneric(const ObjId& oid, const string& fieldName, const py::object
     }
     auto fieldType = finfo->rttiType();
 
-    if(fieldType == "double")
+    if (fieldType == "double")
         return Field<double>::set(oid, fieldName, val.cast<double>());
-    if(fieldType == "float")
+    if (fieldType == "float")
         return Field<float>::set(oid, fieldName, val.cast<float>());
-    if(fieldType == "unsigned int")
-        return Field<unsigned int>::set(oid, fieldName, val.cast<unsigned int>());
-    if(fieldType == "unsigned long")
-        return Field<unsigned long>::set(oid, fieldName, val.cast<unsigned long>());
-    if(fieldType == "int")
+    if (fieldType == "unsigned int")
+        return Field<unsigned int>::set(oid, fieldName,
+                                        val.cast<unsigned int>());
+    if (fieldType == "unsigned long")
+        return Field<unsigned long>::set(oid, fieldName,
+                                         val.cast<unsigned long>());
+    if (fieldType == "int")
         return Field<int>::set(oid, fieldName, val.cast<int>());
-    if(fieldType == "bool")
+    if (fieldType == "bool")
         return Field<bool>::set(oid, fieldName, val.cast<bool>());
-    if(fieldType == "string")
+    if (fieldType == "string")
         return Field<string>::set(oid, fieldName, val.cast<string>());
-    if(fieldType == "char")
+    if (fieldType == "char")
         return Field<char>::set(oid, fieldName, val.cast<char>());
-    if(fieldType == "ObjId")
+    if (fieldType == "ObjId")
         return Field<ObjId>::set(oid, fieldName, val.cast<ObjId>());
-    if(fieldType == "Id")
+    if (fieldType == "Id")
         return Field<Id>::set(oid, fieldName, val.cast<Id>());
-    if(fieldType == "Variable")
+    if (fieldType == "Variable")
         return Field<Variable>::set(oid, fieldName, val.cast<Variable>());
 
-    throw runtime_error("NotImplemented: setField for " + fieldName + " with value type " + fieldType); 
+    throw runtime_error("NotImplemented: setField for " + fieldName +
+                        " with value type " + fieldType);
     return false;
 }
 
@@ -99,7 +102,8 @@ py::object getFieldGeneric(const ObjId& oid, const string& fieldName)
     auto finfo = cinfo->findFinfo(fieldName);
 
     if (!finfo) {
-        cout << "Error: " << fieldName << " is not found on " << oid.path() << endl;
+        cout << "Error: " << fieldName << " is not found on " << oid.path()
+             << endl;
         return pybind11::none();
     }
 
@@ -123,38 +127,12 @@ py::object getFieldGeneric(const ObjId& oid, const string& fieldName)
     return pybind11::none();
 }
 
-template<>
-ObjId connectVec(const MooseVec& src, const string& srcField, const ObjId& tgt, const string& tgtField)
-{
-    ObjId result;
-    for (const auto& obj : src.objs())
-        result = connect<ObjId, ObjId>(obj, srcField, tgt, tgtField);
-    return result;
-}
-
-template<>
-ObjId connectVec(const ObjId& src, const string& srcField, const MooseVec& tgt, const string& tgtField)
-{
-    ObjId result;
-    for (const auto& obj : tgt.objs())
-        result = connect<ObjId, ObjId>(src, srcField, obj, tgtField);
-    return result;
-}
-
-template<>
-ObjId connectVec(const MooseVec& src, const string& srcField, const MooseVec& tgt, const string& tgtField)
-{
-    ObjId result;
-    if (src.size() != tgt.size())
-        throw runtime_error(
-                "Size mismatch for source and target vectors. Source size " +
-                std::to_string(src.size()) + ", target size " +
-                std::to_string(tgt.size()) + ".");
-    for (size_t i = 0; i < src.size(); i++)
-        result = connect<ObjId, ObjId>(src.objs()[i], srcField, tgt.objs()[i], tgtField);
-    return result;
-}
-
+// ObjId connectGeneric(const py::object& src, const string srcfield,
+//                      const py::object& tgt, const string& tgtfield,
+//                      const string& type)
+// {
+//     return src.connect(srcfield, tgt, tgtfield, type);
+// }
 
 PYBIND11_MODULE(_cmoose, m)
 {
@@ -233,12 +211,12 @@ PYBIND11_MODULE(_cmoose, m)
         // .def("getElementField", &getElementField)
         // .def("getElementFieldItem", &getElementFieldItem)
         // .def("getNumpy", &getFieldNumpy<double>)
-    
+
         /**
         *  Override __eq__ etc.
         */
-        .def("__eq__", [](const ObjId& a, const ObjId& b){ return a==b; })
-        .def("__ne__", [](const ObjId& a, const ObjId& b){ return a!=b; })
+        .def("__eq__", [](const ObjId& a, const ObjId& b) { return a == b; })
+        .def("__ne__", [](const ObjId& a, const ObjId& b) { return a != b; })
 
         /**
         * Attributes.
@@ -261,14 +239,30 @@ PYBIND11_MODULE(_cmoose, m)
         //---------------------------------------------------------------------
         //  Connect
         //---------------------------------------------------------------------
-        .def("connect", &connect<ObjId, ObjId>)
-        .def("connect", &connect<ObjId, Id>)
-        .def("connect", &connect<Id, ObjId>)
-        .def("connect", &connect<Id, Id>)
         // This would be so much easier with c++17.
-        .def("connect", &connectVec<MooseVec, ObjId>)
-        .def("connect", &connectVec<ObjId, MooseVec>)
-        .def("connect", &connectVec<MooseVec, MooseVec>)
+        .def("connect",
+             [](const ObjId& src, const string& srcfield, const ObjId& tgt,
+                const string& tgtfield, const string& type) {
+             return mooseConnect(src, srcfield, tgt, tgtfield, type);
+         })
+        // // , "src"_a, "srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a)
+        // //, "src"_a, "srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a =
+        // //"OneToAll")
+        // .def("connect", &connectVec<MooseVec, MooseVec>)
+        // // , "src"_a, //"srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a =
+        // // "OneToOne")
+        // .def("connect", &connect<ObjId, ObjId>)
+        // // , "src"_a, "srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a =
+        // // "Single")
+        // .def("connect", &connect<ObjId, Id>)
+        // // , "src"_a, "srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a =
+        // // "Single")
+        // .def("connect", &connect<Id, ObjId>)
+        // // , "src"_a, "srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a =
+        // // "Single")
+        // .def("connect", &connect<Id, Id>)
+        // // , "src"_a, "srcfield"_a, "dest"_a, "destfield"_a, "msgtype"_a =
+        // // "Single")
 
         //---------------------------------------------------------------------
         //  Extra
@@ -310,6 +304,8 @@ PYBIND11_MODULE(_cmoose, m)
         .def(py::init<const string&, unsigned int, const string&>(), "path"_a,
              "n"_a = 1, "dtype"_a = "Neutral")  // Default
         .def(py::init<const ObjId&>())
+        .def("connect", &MooseVec::connectToSingle)
+        .def("connect", &MooseVec::connectToVec)
         .def("__len__", &MooseVec::len)
         .def("__iter__",
              [](const MooseVec& v) {
@@ -327,7 +323,9 @@ PYBIND11_MODULE(_cmoose, m)
         // This is to provide old API support. Some scripts use .vec even on a
         // vec to get a vec. So silly or so Zen?!
         .def_property_readonly("vec", [](const MooseVec& vec) { return &vec; },
-                               py::return_value_policy::reference_internal);
+                               py::return_value_policy::reference_internal)
+        .def_property_readonly("type",
+                               [](const MooseVec& v) { return "moose.vec"; });
 
     // Module functions.
     m.def("getShell",
@@ -346,9 +344,9 @@ PYBIND11_MODULE(_cmoose, m)
     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);
     m.def("setClock", &mooseSetClock);
+    m.def("useClock", &mooseUseClock);
     m.def("loadModelInternal", &loadModelInternal);
     m.def("getFieldDict", &mooseGetFieldDict, "className"_a,
           "finfoType"_a = "");
diff --git a/pybind11/pymoose.h b/pybind11/pymoose.h
@@ -43,18 +43,8 @@ py::array_t<T> getFieldNumpy(const ObjId& id, const string& fname)
     return py::array_t<T>(v.size(), v.data());
 }
 
-template <typename P = ObjId, typename Q = ObjId>
-ObjId connect(const P& src, const string& srcField, const Q& tgt,
-              const string& tgtField)
-{
-    return mooseConnect(ObjId(src), srcField, ObjId(tgt), tgtField);
-}
-
-template<typename P, typename Q>
-ObjId connectVec(const P& src, const string& srcField, const Q& tgt, const string& tgtField);
-
-
-bool setFieldGeneric(const ObjId& id, const string& frname, const py::object& val);
+bool setFieldGeneric(const ObjId& id, const string& frname,
+                     const py::object& val);
 
 py::object getFieldGeneric(const ObjId& oid, const string& fname);
 
diff --git a/python/moose/moose.py b/python/moose/moose.py
diff --git a/tests/py_moose/test_GraupnerBrunel2012_STDPfromCaPlasticity.py b/tests/py_moose/test_GraupnerBrunel2012_STDPfromCaPlasticity.py

Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,10 @@ ObjId getElementFieldItem(const ObjId& objid, const string& fname,`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`ObjId mooseConnect(const ObjId& src, const string& srcField, const ObjId& tgt,`
`217`		`- const string& tgtField)`
	`217`	`+ const string& tgtField, const string& msgType)`
`218`	`218`	`{`
`219`	`219`	`auto pShell = getShellPtr();`
`220`		`- return pShell->doAddMsg("Single", src, srcField, tgt, tgtField);`
	`220`	`+ return pShell->doAddMsg(msgType, src, srcField, tgt, tgtField);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`bool mooseDelete(const ObjId& oid)`
`@@ -241,6 +241,11 @@ void mooseSetClock(const unsigned int clockId, double dt)`
`241`	`241`	`getShellPtr()->doSetClock(clockId, dt);`
`242`	`242`	`}`
`243`	`243`
	`244`	`+void mooseUseClock(size_t tick, const string& path, const string& field)`
	`245`	`+{`
	`246`	`+ getShellPtr()->doUseClock(path, field, tick);`
	`247`	`+}`
	`248`	`+`
`244`	`249`	`/* --------------------------------------------------------------------------*/`
`245`	`250`	`/**`
`246`	`251`	`* @Synopsis Current Working Element.`