Changeset 78c6ae6 in observatorio for simulacion

Timestamp:

Oct 22, 2014, 6:00:54 PM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

18610a4

Parents:

512ad64

Message:

pendiente de correccion de conversion de numeros a cadenas

Location:

simulacion/SimEscenariosEconomicos

Files:

• common.C (modified) (4 diffs)
• ioManager.H (modified) (4 diffs)
• productionNetwork.H (modified) (1 diff)
• queries.C (modified) (6 diffs)

simulacion/SimEscenariosEconomicos/common.C

@@ -213 +213 @@
 std::string numtostrRec(const real & num, const char & thousandSep) {
 
-    if (num < 1000) {
+    if (num < 1000.0) {
 
         std::stringstream sstr;
@@ -222 +222 @@
     }
 
-    real aux = num / 1000;
+    real aux = num / 1000.0;
 
     long long intPart = (long long) aux;
@@ -236 +236 @@
     std::string str = sstr.str();
 
-    if (aux < 100.0L)
+    if (aux < 100.0L) {
         str = "0" + str;
-
-    if (aux < 10.0L)
+    }
+
+    if (aux < 10.0L) {
         str = "0" + str;
+    }
 
     return numtostrRec(intPart, thousandSep) + thousandSep + str;
@@ -276 +278 @@
 
     if (strDec.size() > 2)
-        ret += decSep + strDec.substr(2, strDec.size() - 2);
+        ret += decSep +  strDec.substr(2, strDec.size() - 2);
 
     return sign + ret;

simulacion/SimEscenariosEconomicos/ioManager.H

@@ -437 +437 @@
                         scode << input.id;
 
-                        if (productInfo.nationality == "V")
+                        if (productInfo.companyRif.size() > 0)
                           scode << productInfo.companyRif;
                         else
@@ -1428 +1428 @@
                 c1.levels.for_each(AddLevelToStr(str1));
 
-                str1.append(c1.rif);
+                if (c1.nationality == "E") {
+                    str1.append(c1.companyName);
+                } else {
+                    str1.append(c1.rif);
+                }
             }
 
@@ -1441 +1445 @@
                 c2.levels.for_each(AddLevelToStr(str2));
 
-                str2.append(c2.rif);
+                if (c2.nationality == "E") {
+                    str2.append(c2.companyName);
+                } else {
+                    str2.append(c2.rif);
+                }
             }
 
@@ -1451 +1459 @@
 
     typedef Map <ClusterByPlantInfo, NodeSet,
-                         ClusterByPlantInfoCmp> ClusterMap;
+                 ClusterByPlantInfoCmp> ClusterMap;
 
     /// Functor para escribir información completa de un nodo en un dot.

simulacion/SimEscenariosEconomicos/productionNetwork.H

@@ -132 +132 @@
 
     bool operator () (const Company & c1, const Company & c2) {
-        return c1.getRif() < c2.getRif();
+
+        const std::string & str1 = c1.getNationality() == "E"
+                                   ? c1.getName() : c1.getRif();
+
+        const std::string & str2 = c2.getNationality() == "E"
+                                   ? c2.getName() : c2.getRif();
+
+        return str1 < str2;
     }
 };

simulacion/SimEscenariosEconomicos/queries.C

@@ -495 +495 @@
 
 real computeInputProportionFromSupplier(const std::string & supplierRif,
-                                          const size_t & inputId,
-                                          const std::string & year) {
-
-    AutoConnection conn;
-
-    DBQuery query(conn);
-
-    StrQuery strQuery;
-
-    strQuery.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::RIF));
+                                        const std::string & supplierName,
+                                        const std::string & nationality,
+                                        const size_t & inputId,
+                                        const std::string & year) {
+
+    AutoConnection conn;
+
+    DBQuery query(conn);
+
+    StrQuery strQuery;
+
+    const std::string & to_compare = nationality == "E" ?
+                                     supplierName : supplierRif;
+
+    if (nationality == "E") {
+        strQuery.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::NAME));
+    } else {
+        strQuery.addSelect(concatas(DB::SUPPLIER_TABLE_NAME, DB::RIF));
+    }
     strQuery.addSelect(concatas(DB::INPUT_SUPPLIER_TABLE_NAME,
                                 DB::BOUGHT_QUANTITY));
@@ -531 +540 @@
     while (query.next()) {
 
-        if (supplierRif == query.getValue(0))
+        if (to_compare == query.getValue(0)) {
             suppliedQuantity = std::atof(query.getValue(1));
+        }
 
         sum += std::atof(query.getValue(1));
@@ -541 +551 @@
 
 real computeProportionByTariffCode(const std::string & tariffCode,
-                                     const std::string & rif,
-                                     const size_t & productId,
-                                     const std::string & year) {
+                                   const std::string & rif,
+                                   const size_t & productId,
+                                   const std::string & year) {
 
     AutoConnection conn;
@@ -605 +615 @@
 
     std::string rif;
+    std::string companyName;
+    std::string nationality;
 
     if (src->getType() == PRODUCT_GOOD) {
@@ -611 +623 @@
 
         rif = product->getProducerPlant()->getOwnerCompany()->getRif();
+        companyName = product->getProducerPlant()->getOwnerCompany()->getName();
+        nationality =
+            product->getProducerPlant()->getOwnerCompany()->getNationality();
 
     } else {
@@ -617 +632 @@
 
         rif = input->getProviderCompany()->getRif();
+        companyName = input->getProviderCompany()->getName();
+        nationality = input->getProviderCompany()->getNationality();
     }
 
     real proportionFromSupplier =
-        computeInputProportionFromSupplier(rif, info.inputId, year);
+        computeInputProportionFromSupplier(rif, companyName, nationality,
+                                           info.inputId, year);
 
     real proportionByTariffCode =