Últimos cambios y documentación.

[z.facultad/75.68/celdas.git] / trunk / src / plugin.cpp

diff --git a/trunk/src/plugin.cpp b/trunk/src/plugin.cpp
index 20096f3a1fdc0522e1ed8f6519aecd290c370255..cea797554d1105500b2c7db46b7fe873379abe27 100644 (file)
--- a/trunk/src/plugin.cpp
+++ b/trunk/src/plugin.cpp
@@ -50,20 +50,13 @@ int SAbrTeoriaGetAccion(brEval args[], brEval* result, void* data)
        return EC_OK;\r
 }\r
 \r
-// void TeoriaDelete(pointer{Teoria})\r
-int SAbrTeoriaDelete(brEval args[], brEval* result, void* data)\r
-{\r
-       delete (CTeoria*) BRPOINTER(args);\r
-       return EC_OK;\r
-}\r
-\r
 \r
 /////////////////////////// CSistemaAutonomo /////////////////////////\r
 \r
-// pointer{SistemaAutonomo} SistemaAutonomoNew()\r
+// pointer{SistemaAutonomo} SistemaAutonomoNew(int, int)\r
 int SAbrSistemaAutonomoNew(brEval args[], brEval* result, void* data)\r
 {\r
-       result->set(new CSistemaAutonomo());\r
+       result->set(new CSistemaAutonomo(BRINT(args), BRINT(args+1)));\r
        return EC_OK;\r
 }\r
 \r
@@ -74,10 +67,13 @@ int SAbrSistemaAutonomoAddTeoria(brEval args[], brEval* result, void* data)
        CTeoria* t = (CTeoria*) BRPOINTER(args+1);\r
        sa->teorias.add(t->nombre, t);\r
 #ifdef DEBUG\r
-       std::cout << "Agrega teoria " << t->nombre << ":\n";\r
-       std::cout << "  .datos_iniciales:\n" << t->datos_iniciales << "\n";\r
-       std::cout << "  .datos_finales:\n" << t->datos_finales << "\n";\r
+       std::cout << "Agrega teoria " << *t << ":\n";\r
+       std::cout << "\tdatos_iniciales:\n" << t->datos_iniciales << "\n";\r
+       std::cout << "\tdatos_finales:\n" << t->datos_finales << "\n";\r
 #endif // DEBUG\r
+#ifdef LOG\r
+       std::cout << "Agrega teoria: " << *t << "," << t->datos_iniciales << "," << t->datos_finales << "\n";\r
+#endif // LOG\r
        return EC_OK;\r
 }\r
 \r
@@ -149,10 +145,8 @@ DLLEXPORT void SAbrFunctions(void *data)
                       AT_STRING, AT_POINTER, 0);\r
        brNewBreveCall(data, "TeoriaGetAccion", SAbrTeoriaGetAccion,\r
                       AT_STRING, AT_POINTER, 0);\r
-       brNewBreveCall(data, "TeoriaDelete", SAbrTeoriaDelete,\r
-                      AT_NULL, AT_POINTER, 0);\r
        brNewBreveCall(data, "SistemaAutonomoNew", SAbrSistemaAutonomoNew,\r
-                      AT_POINTER, 0);\r
+                      AT_POINTER, AT_INT, AT_INT, 0);\r
        brNewBreveCall(data, "SistemaAutonomoAddTeoria", SAbrSistemaAutonomoAddTeoria,\r
                       AT_NULL, AT_POINTER, AT_POINTER, 0);\r
        brNewBreveCall(data, "SistemaAutonomoSetValue", SAbrSistemaAutonomoSetValue,\r