Merge branch 'pybind11_shell' of gitlab.com:dilawar/moose-core into pybind11_shell

Dilawar Singh · Dilawar Singh · commit 1abb6f1f6a97 · 2020-03-31T02:24:30.000+05:30
diff --git a/pybind11/helper.cpp b/pybind11/helper.cpp
@@ -230,7 +230,7 @@ bool mooseDelete(const string& path)
     return getShellPtr()->doDelete(ObjId(path));
 }
 
-ObjId mooseCreate(const string type, const string& path, size_t numdata)
+Id mooseCreate(const string type, const string& path, size_t numdata)
 {
     auto p = moose::splitPath(path);
     return getShellPtr()->doCreate2(type, ObjId(p.first), p.second, numdata);
diff --git a/pybind11/helper.h b/pybind11/helper.h
@@ -47,7 +47,7 @@ ObjId mooseConnect(const ObjId& src, const string& srcField, const ObjId& tgt,
 bool mooseDelete(const ObjId& oid);
 bool mooseDelete(const string& path);
 
-ObjId mooseCreate(const string type, const string& path, size_t numdata = 1);
+Id mooseCreate(const string type, const string& path, size_t numdata = 1);
 
 Id mooseCopy(const Id& orig, ObjId newParent, string newName,
                 unsigned int n, bool toGlobal, bool copyExtMsgs);
diff --git a/pybind11/pymoose.cpp b/pybind11/pymoose.cpp
@@ -91,7 +91,7 @@ PYBIND11_MODULE(_cmoose, m)
         .def("__repr__", [](const Id& id) {
              return "<Id id=" + std::to_string(id.value()) + " path=" +
                     id.path() + " class=" + id.element()->cinfo()->name() + ">";
-         });
+                    });
 
     py::class_<ObjId>(m, "_ObjId")
         .def(py::init<>())
@@ -138,6 +138,7 @@ PYBIND11_MODULE(_cmoose, m)
         .def("__setattr__", &setProperty<vector<double>>)
         .def("__setattr__", &setProperty<std::string>)
         .def("__setattr__", &setProperty<ObjId>)
+        .def("__setattr__", &setProperty<Id>)
         .def("__setattr__", &setProperty<bool>)
 
         //---------------------------------------------------------------------
diff --git a/pybind11/pymoose.h b/pybind11/pymoose.h
@@ -17,10 +17,13 @@
 #ifndef PYMOOSE_H
 #define PYMOOSE_H
 
+#include "../external/prettyprint.hpp"
+
 template <typename T = double>
-void setProperty(const ObjId& id, const string& fname, T val)
+bool setProperty(const ObjId& id, const string& fname, T val)
 {
-    Field<T>::set(id, fname, val);
+    // MOOSE_DEBUG( "Setting " << fname << " on " << id.path() << " with value " << val);
+    return Field<T>::set(id, fname, val);
 }
 
 template <typename T = double>
diff --git a/tests/py_moose/test_Xreacs2.py b/tests/py_moose/test_Xreacs2.py
@@ -28,8 +28,10 @@ def test_xreac2():
     ks1 = moose.Ksolve( '/model/kinetics/ksolve' )
     ds1 = moose.Dsolve( '/model/kinetics/dsolve' )
     s1 = moose.Stoich( '/model/kinetics/stoich' )
+    print('xx', s1, type(s1), ks1)
     s1.compartment = moose.element( '/model/kinetics' )
     s1.ksolve = ks1
+    print('yyy', s1.ksolve)
     s1.dsolve = ds1
     s1.path = '/model/kinetics/##'
 
diff --git a/tests/py_moose/test_synchan.py b/tests/py_moose/test_synchan.py
@@ -24,7 +24,8 @@ def make_synapse(path):
     # IN new implementation, there is SimpleSynHandler class which takes cares
     # of multiple synapses. Class SynChan does not have any .synapse field.
     synH = moose.SimpleSynHandler( '%s/SynHandler' % path)
-    synH.synapse.num = 1
+    print(synH)
+    #synH.synapse.num = 1
     ## syn.bufferTime = 1.0 # ms
     synH.synapse.delay = 1.0
     synH.synapse.weight = 1.0

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ bool mooseDelete(const string& path)`
`230`	`230`	`return getShellPtr()->doDelete(ObjId(path));`
`231`	`231`	`}`
`232`	`232`
`233`		`-ObjId mooseCreate(const string type, const string& path, size_t numdata)`
	`233`	`+Id mooseCreate(const string type, const string& path, size_t numdata)`
`234`	`234`	`{`
`235`	`235`	`auto p = moose::splitPath(path);`
`236`	`236`	`return getShellPtr()->doCreate2(type, ObjId(p.first), p.second, numdata);`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,13 @@`
`17`	`17`	`#ifndef PYMOOSE_H`
`18`	`18`	`#define PYMOOSE_H`
`19`	`19`
	`20`	`+#include "../external/prettyprint.hpp"`
	`21`	`+`
`20`	`22`	`template <typename T = double>`
`21`		`-void setProperty(const ObjId& id, const string& fname, T val)`
	`23`	`+bool setProperty(const ObjId& id, const string& fname, T val)`
`22`	`24`	`{`
`23`		`- Field<T>::set(id, fname, val);`
	`25`	`+ // MOOSE_DEBUG( "Setting " << fname << " on " << id.path() << " with value " << val);`
	`26`	`+ return Field<T>::set(id, fname, val);`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`template <typename T = double>`