adding iterators

kratos/python/add_kratos_parameters_to_python.cpp

@@ -27,10 +27,44 @@ namespace Kratos
 namespace Python
 {
 
+Parameters::iterator NonConstBegin(Parameters& el)
+{
+ return el.begin();
+}
+Parameters::iterator NonConstEnd(Parameters& el)
+{
+ return el.end();
+}
+
+boost::python::list items(Parameters const& self)
+{
+ boost::python::list t;
+ for(Parameters::const_iterator it=self.begin(); it!=self.end(); ++it)
+ t.append( boost::python::make_tuple(it.name(), *it) );
+ return t;
+}
+
+boost::python::list keys(Parameters const& self)
+{
+ boost::python::list t;
+ for(Parameters::const_iterator it=self.begin(); it!=self.end(); ++it)
+ t.append(it.name());
+ return t;
+}
+
+boost::python::list values(Parameters const& self)
+{
+ boost::python::list t;
+ for(Parameters::const_iterator it=self.begin(); it!=self.end(); ++it)
+ t.append(*it);
+ return t;
+}
 
 void AddKratosParametersToPython()
 {
  using namespace boost::python;
+
+ class_<Parameters::iterator >("ParametersIterator", no_init);
 
  //init<rapidjson::Value& >())
  class_<Parameters, Parameters::Pointer >("Parameters", init<const std::string& >())
@@ -66,6 +100,10 @@ void AddKratosParametersToPython()
  .def("__getitem__", &Parameters::GetValue)
  .def("__setitem__", &Parameters::SetArrayItem)
  .def("__getitem__", &Parameters::GetArrayItem)
+ .def("__iter__", range(&NonConstBegin, &NonConstEnd) )
+ .def("items", &items )
+ .def("keys", &keys )
+ .def("values", &values )
  .def(self_ns::str(self))
  ;
 

kratos/tests/test_kratos_parameters.py

@@ -257,6 +257,35 @@ def test_add_value(self):
  self.assertTrue(kp.Has("new_double"))
  self.assertEqual(kp["new_double"].GetDouble(), 1.0)
 
+ def test_iterators(self):
+ kp = Parameters(json_string)
+
+ #iteration by range
+ nitems = 0
+ for iterator in kp:
+ nitems = nitems + 1
+ self.assertEqual(nitems, 5)
+
+ #iteration by items
+ for key,value in kp.items():
+ print(value.PrettyPrintJsonString())
+ self.assertEqual(kp[key].PrettyPrintJsonString(), value.PrettyPrintJsonString())
+ #print(key,value)
+
+ #testing values
+ expected_values = ['true', '2.0', '10', '{"list_value":[3,"hi",false],"tmp":5.0}', '"hello"']
+ counter = 0
+ for value in kp.values():
+ self.assertEqual(value.WriteJsonString(), expected_values[counter])
+ counter += 1
+
+ #testing values
+ expected_keys = ['bool_value', 'double_value', 'int_value', 'level1', 'string_value']
+ counter = 0
+ for key in kp.keys():
+ self.assertEqual(key, expected_keys[counter])
+ counter += 1 
+
 
 if __name__ == '__main__':
  KratosUnittest.main()