Changeset 666042a in observatorio for simulacion/ModuloDinamico

Timestamp:

Jan 7, 2015, 4:11:35 PM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

bf76088

Parents:

7e7ebba

Message:

Ajuste, cuando un productor no declara precio de venta del ano en estudio, se utiliza el precio de compra declarado por el comprador

Location:

simulacion/ModuloDinamico

Files:

• io_manager.H (modified) (4 diffs)
• queries.C (modified) (1 diff)
• simulator.C (modified) (2 diffs)

simulacion/ModuloDinamico/io_manager.H

@@ -456 +456 @@
                     scode << input.get_id();
 
-                    if (input.get_nationality() == "V")
+                    if (input.get_nationality() != "E")
                       scode << input.get_company_rif();
                     else
@@ -469 +469 @@
                         std::shared_ptr<Good> ptr_good;
 
-                        if (input.get_nationality() == "V")
+                        if (input.get_nationality() != "E")
                           ptr_good = std::shared_ptr<Good>(new Input(input));
                         else
@@ -564 +564 @@
                         src = *ptr_src;
 
+                      Product * ptr_product =
+                        static_cast<Product *>(src->get_info().get());
+
                       IP_Relationship ip_relationship;
 
@@ -573 +576 @@
                       );
 
-                      ip_relationship.set_purchase_price(product.get_price());
+                      if (ptr_product->get_price() == 0.0)
+                        get_acquisition_price(input.get_nationality(),
+                                              input.get_id(), year);
+                      else
+                        ip_relationship.set_purchase_price(
+                          ptr_product->get_price()
+                        );
+
+                      ip_relationship.set_bought_quantity(
+                        get_declared_bought_quantity(
+                          ptr_product->get_company_rif(),
+                          ptr_product->get_company_name(),
+                          input.get_id(),
+                          year
+                        )
+                      );
 
                       src->get_info()->set_level(

simulacion/ModuloDinamico/queries.C

@@ -294 +294 @@
                                DB::SUPPLIER_ID),
                         concat(DB::SUPPLIER_TABLE_NAME, DB::ID)));
-  str_query.addWhere(op(concat(DB::INPUT_SUPPLIER_TABLE_NAME, DB::YEAR_R),
-                        year));
 
   if (not query.exec(str_query))

simulacion/ModuloDinamico/simulator.C

@@ -315 +315 @@
                                  ip_sim_attr.bought_quantity;
 
+      if (possible_production == 0.0)
+        {
+          std::cout << "RQ: " << ip_rel.get_requested_quantity() << " - "
+                    << "BQ: " << ip_sim_attr.bought_quantity << '\n';
+        }
+
       // Se actualiza la máxima producción posible.
       if (possible_production < max_possible_production)
@@ -422 +428 @@
 
       ip_sim_attr_t.bought_quantity = internal_quantity * proportion;
+
+      I(ip_sim_attr_t.bought_quantity > 0.0);
     }
 }