Primeras pruebas, etc.

julienmalard · Apr 5, 2019 · da062ae · da062ae
1 parent 97055e5
commit da062ae
Show file tree

Hide file tree

Showing 20 changed files with 7,685 additions and 5 deletions.
diff --git a/Licencia/LICENÇA.md → licencia/LICENÇA.md b/Licencia/LICENÇA.md → licencia/LICENÇA.md
diff --git a/Licencia/лицензия.md → licencia/лицензия.md b/Licencia/лицензия.md → licencia/лицензия.md
diff --git a/Licencia/رخصة.pdf → licencia/رخصة.pdf b/Licencia/رخصة.pdf → licencia/رخصة.pdf
diff --git a/Licencia/許諾書.md → licencia/許諾書.md b/Licencia/許諾書.md → licencia/許諾書.md
diff --git a/pruebas/test_base.py b/pruebas/test_base.py
@@ -0,0 +1,6 @@
+import unittest
+
+
+class Prueba(unittest.TestCase):
+    def test_importar(símismo):
+        pass
diff --git a/tikon/ecs/dists.py b/tikon/ecs/dists.py
@@ -406,6 +406,8 @@ def obt_val(símismo, índs=None, heredar=True):
             í = índs.pop(0)
             if str(í) in símismo.índs:
                 return símismo.índs[str(í)].obt_val(índs, heredar)
+            elif í in símismo.índs:  # para hacer: es muy inelegante.
+                return símismo.índs[í].obt_val(índs, heredar)
             return símismo.val if heredar else []
 
     def __getitem__(símismo, itema):

diff --git a/tikon/ejemplos/calibs Sitio A ens fscabc/Sitio A.json b/tikon/ejemplos/calibs Sitio A ens fscabc/Sitio A.json
@@ -0,0 +1,194 @@
+{
+  "red": {
+    "Pobs": {
+      "0": {
+        "val": {
+          "Sitio A": {
+            "val": {
+              "pesos": [
+                0.0754437179493827,
+                0.07489927874768613,
+                0.07267485572361154,
+                0.06434752850528105,
+                0.06769194074427431,
+                0.0710104273069963,
+                0.07214597192767774,
+                0.071762271918863,
+                0.06388086633239828,
+                0.06343494470053251,
+                0.060251271654421096,
+                0.060614231122218816,
+                0.059992014891708446,
+                0.060251271654421096,
+                0.06159940682052691
+              ],
+              "tipo": "DistTraza",
+              "trz": [
+                1082024.3634606532,
+                193190.63000950657,
+                46726.160039127004,
+                116063.65775109224,
+                116063.65775109224,
+                46726.160039127004,
+                46726.160039127004,
+                46726.160039127004,
+                116063.65775109224,
+                116063.65775109224,
+                116063.65775109224,
+                116063.65775109224,
+                116063.65775109224,
+                116063.65775109224,
+                116063.65775109224
+              ]
+            },
+            "índs": {}
+          }
+        },
+        "índs": {
+          "etapa": "Parasitoide larvas adulto"
+        }
+      },
+      "1": {
+        "val": {
+          "Sitio A": {
+            "val": {
+              "pesos": [
+                0.0754437179493827,
+                0.07489927874768613,
+                0.07267485572361154,
+                0.06434752850528105,
+                0.06769194074427431,
+                0.0710104273069963,
+                0.07214597192767774,
+                0.071762271918863,
+                0.06388086633239828,
+                0.06343494470053251,
+                0.060251271654421096,
+                0.060614231122218816,
+                0.059992014891708446,
+                0.060251271654421096,
+                0.06159940682052691
+              ],
+              "tipo": "DistTraza",
+              "trz": [
+                78227.1706559266,
+                173414.26508177564,
+                73241.29257380836,
+                47387.08174877226,
+                47387.08174877226,
+                73241.29257380836,
+                73241.29257380836,
+                73241.29257380836,
+                47387.08174877226,
+                47387.08174877226,
+                47387.08174877226,
+                47387.08174877226,
+                47387.08174877226,
+                47387.08174877226,
+                47387.08174877226
+              ]
+            },
+            "índs": {}
+          }
+        },
+        "índs": {
+          "etapa": "Parasitoide pupa adulto"
+        }
+      },
+      "2": {
+        "val": {
+          "Sitio A": {
+            "val": {
+              "pesos": [
+                0.0754437179493827,
+                0.07489927874768613,
+                0.07267485572361154,
+                0.06434752850528105,
+                0.06769194074427431,
+                0.0710104273069963,
+                0.07214597192767774,
+                0.071762271918863,
+                0.06388086633239828,
+                0.06343494470053251,
+                0.060251271654421096,
+                0.060614231122218816,
+                0.059992014891708446,
+                0.060251271654421096,
+                0.06159940682052691
+              ],
+              "tipo": "DistTraza",
+              "trz": [
+                476510.2904136535,
+                435953.0900970834,
+                173008.7922450463,
+                176554.62582164945,
+                176554.62582164945,
+                173008.7922450463,
+                173008.7922450463,
+                173008.7922450463,
+                176554.62582164945,
+                176554.62582164945,
+                176554.62582164945,
+                176554.62582164945,
+                176554.62582164945,
+                176554.62582164945,
+                176554.62582164945
+              ]
+            },
+            "índs": {}
+          }
+        },
+        "índs": {
+          "etapa": "O. arenosella huevo"
+        }
+      },
+      "3": {
+        "val": {
+          "Sitio A": {
+            "val": {
+              "pesos": [
+                0.0754437179493827,
+                0.07489927874768613,
+                0.07267485572361154,
+                0.06434752850528105,
+                0.06769194074427431,
+                0.0710104273069963,
+                0.07214597192767774,
+                0.071762271918863,
+                0.06388086633239828,
+                0.06343494470053251,
+                0.060251271654421096,
+                0.060614231122218816,
+                0.059992014891708446,
+                0.060251271654421096,
+                0.06159940682052691
+              ],
+              "tipo": "DistTraza",
+              "trz": [
+                45290.26071580724,
+                62074.47594998828,
+                104052.56809095557,
+                22827.934283125473,
+                22827.934283125473,
+                104052.56809095557,
+                104052.56809095557,
+                104052.56809095557,
+                22827.934283125473,
+                22827.934283125473,
+                22827.934283125473,
+                22827.934283125473,
+                22827.934283125473,
+                22827.934283125473,
+                22827.934283125473
+              ]
+            },
+            "índs": {}
+          }
+        },
+        "índs": {
+          "etapa": "O. arenosella adulto"
+        }
+      }
+    }
+  }
+}