diff --git a/models/dimers random walk.xml b/models/dimers random walk.xml index 962989b..89bb2eb 100644 --- a/models/dimers random walk.xml +++ b/models/dimers random walk.xml @@ -34,7 +34,7 @@ - 6 + 5 @@ -60,13 +60,12 @@ - + + - - - - + + + diff --git a/src/__pycache__/model.cpython-39.pyc b/src/__pycache__/model.cpython-39.pyc index 9faf524..d04e8cb 100644 Binary files a/src/__pycache__/model.cpython-39.pyc and b/src/__pycache__/model.cpython-39.pyc differ diff --git a/src/glimpse.py b/src/glimpse.py index 27b2053..e3b8b64 100644 --- a/src/glimpse.py +++ b/src/glimpse.py @@ -7,6 +7,12 @@ nb_sites = int (model.testmodel.get_parameters().spaceparam.get_site_multiplicit nb_arrows = int (model.testmodel.get_states().get_space(0).get_nb_arrows()) weight = int (model.testmodel.get_states().get_space(0).get_arrow(0).get_weight()) +# TODO Contrôles cohérence des données (module à prévoir) + # pour condition et arrow : weight < weight_max (à définir) + # pour condition et arrow : arrow.site < site_multiplicity + # pour condition et arrow : arrow.x < space-param.dimension.x (idem autres axes) + # condition.parent <= condition.node_id max value (donc deux lectures) + space = [] cells = [] sites = [] diff --git a/src/model.py b/src/model.py index ebb365c..411b5d1 100644 --- a/src/model.py +++ b/src/model.py @@ -414,3 +414,5 @@ modelPath = "../models/dimers random walk.xml" schemaPath = "../schemas/models_0.2.1.xmls" testmodel = Model(modelPath, schemaPath) + +# TODO weight_max