Changeset 23f4971 in observatorio for simulacion/ModuloDinamico

Timestamp:

Jan 13, 2015, 4:38:44 PM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

e481d13

Parents:

16eed2b

Message:

Agregado campo production a empresas no registradas nacionales, corregido calculo de produccion en t = 0 a empresas no registradas nacionales

Location:

simulacion/ModuloDinamico

Files:

• io_manager.H (modified) (1 diff)
• simulator.C (modified) (1 diff)

simulacion/ModuloDinamico/io_manager.H

@@ -952 +952 @@
               Input * input = static_cast<Input *>(good);
 
+              real production = (input->get_internal_sales() +
+                                 input->get_external_sales()) /
+                                 input->get_price();
+
+              node->set_attribute(XML_PRODUCTION, num_to_str(production));
               node->set_attribute(XML_INTERNAL_SALES,
                                   num_to_str(input->get_internal_sales()));

simulacion/ModuloDinamico/simulator.C

@@ -144 +144 @@
 
   state_0.state_number = 0;
-  state_0.production = ptr_input->get_internal_sales() +
-                       ptr_input->get_external_sales();
+
+  state_0.production = (ptr_input->get_internal_sales() +
+                        ptr_input->get_external_sales()) /
+                        ptr_input->get_price();
   state_0.stock = 0.0;
   state_0.internal_sales = ptr_input->get_internal_sales();