Changeset 46efa36 in observatorio

Timestamp:

Sep 12, 2014, 11:46:45 AM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

d2fd216

Parents:

774f7b0

Message:

Correccion de error al generar las redes aguas abajo

Location:

simulacion/SimEscenariosEconomicos

Files:

• ioManager.H (modified) (2 diffs)
• queries.C (modified) (1 diff)

simulacion/SimEscenariosEconomicos/ioManager.H

@@ -594 +594 @@
         Aleph::pair<real, real> & p = it.get_current();
 
-        good->setQuantity(p.first / p.second);
+        good->setQuantity(p.second == 0 ? 0 : p.first / p.second);
 
         it.next();
@@ -638 +638 @@
                 real needed = t->get_info()->getQuantity() * unit;
 
-                real proportion = a->get_info().quantity / sum;
+                real proportion = (sum == 0 ? 0 : a->get_info().quantity / sum);
 
                 a->get_info().usedQuantity = needed * proportion;

simulacion/SimEscenariosEconomicos/queries.C

@@ -384 +384 @@
                          concat(DB::PRODUCT_TABLE_NAME, DB::ID)));
     strQuery.addWhere(op(concat(DB::PRODUCT_INPUT_TABLE_NAME, DB::YEAR), year));
+    strQuery.addWhere(op(concat(DB::PRODUCT_INPUT_TABLE_NAME, DB::QUANTITY),
+                                "0", "<>"));
 
     if (not query.exec(strQuery)) {