ODESimulator only accepts NetworkModel (#482)

Author: kaizu

ecell4/core/NetworkModel.hpp

@@ -83,7 +83,7 @@ class NetworkModel
 
     // NetworkModelTraits
 
-    bool is_static() const
+    bool is_static() const final
     {
         return true;
     }

ecell4/ode/ODESimulator.hpp

@@ -511,6 +511,10 @@ class ODESimulator
 
     void initialize()
     {
+        if (!model_->is_static())
+        {
+            throw std::runtime_error("Only a NetworkModel is accepted. Use expand");
+        }
         const std::vector<Species> species(model_->list_species());
         for(std::vector<Species>::const_iterator it = species.begin();
                 it != species.end(); it++)

ecell4/python_api/core.cpp

@@ -491,6 +491,7 @@ void define_model(py::module& m)
         .def("species_attributes", &Model::species_attributes)
         .def("species_attributes_proceed", &Model::species_attributes_proceed)
         .def("num_reaction_rules", &Model::num_reaction_rules)
+        .def("is_static", &Model::is_static)
         .def("expand", (std::shared_ptr<Model> (Model::*)(
                 const std::vector<Species>&, const Integer, const std::map<Species, Integer>&) const) &Model::expand)
         .def("expand", (std::shared_ptr<Model> (Model::*)(const std::vector<Species>&, const Integer) const) &Model::expand)
@@ -713,7 +714,6 @@ void define_observers(py::module& m)
         .def("dt", &FixedIntervalNumberObserver::dt)
         .def("t0", &FixedIntervalNumberObserver::t0)
         .def("count", &FixedIntervalNumberObserver::count)
-        .def("next_time", &FixedIntervalNumberObserver::next_time)
         .def("data", &FixedIntervalNumberObserver::data)
         .def("targets", &FixedIntervalNumberObserver::targets)
         .def("save", &FixedIntervalNumberObserver::save)
@@ -832,7 +832,6 @@ void define_observers(py::module& m)
         .def("dt", &FixedIntervalCSVObserver::dt)
         .def("t0", &FixedIntervalCSVObserver::t0)
         .def("count", &FixedIntervalCSVObserver::count)
-        .def("next_time", &FixedIntervalCSVObserver::next_time)
         .def("set_header", &FixedIntervalCSVObserver::set_header)
         .def("set_formatter", &FixedIntervalCSVObserver::set_formatter)
         .def(py::pickle(