Changeset 5c51ff9 in observatorio

Timestamp:

Apr 27, 2015, 12:02:38 PM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

ac8ea81

Parents:

a0523b8

Message:

Modificado para que se cree una sola conexion a la base de datos para todas las consultas en lote

Location:

simulacion/SimEscenariosEconomicos

Files:

• indicatorGenerator.C (modified) (15 diffs)
• indicatorGenerator.H (modified) (3 diffs)
• ioManager.H (modified) (13 diffs)
• queries.C (modified) (36 diffs)
• queries.H (modified) (24 diffs)
• simulator.C (modified) (9 diffs)

simulacion/SimEscenariosEconomicos/indicatorGenerator.C

@@ -40 +40 @@
 
 
-void ProductionIndicatorGenerator::writeProductLine(
+void ProductionIndicatorGenerator::writeProductLine(AutoConnection & conn,
     Graph::Node * node, std::ofstream & file,
     Map <long, PlantLocation> & mapPlantLocation,
@@ -73 +73 @@
     if (ptrCiiu == NULL) {
 
-        std::string ciiu = getCiiu(rif);
+        std::string ciiu = getCiiu(conn, rif);
 
         ptrCiiu = mapCompanyCiiu.insert(rif, ciiu);
@@ -120 +120 @@
 }
 
-real computeGeneratedEmployment(Graph::Node * node, const std::string & rif,
-                               const std::string & year,
-                               const real & amountDiff) {
+real computeGeneratedEmployment(AutoConnection & conn, Graph::Node * node,
+                                const std::string & rif,
+                                const std::string & year,
+                                const real & amountDiff) {
 
     real generatedEmployment = 0;
@@ -131 +132 @@
          node->type == ROOT) and good->getType() == PRODUCT_GOOD) {
 
-        real staffNumber = getOperatingStaffNumber(rif, year);
-
-        real totalAmount = getTotalAmount(rif, year);
+        real staffNumber = getOperatingStaffNumber(conn, rif, year);
+
+        real totalAmount = getTotalAmount(conn, rif, year);
 
         generatedEmployment = staffNumber * amountDiff / totalAmount;
@@ -142 +143 @@
 
 
-void ProductionIndicatorGenerator::writeInputLine(
+void ProductionIndicatorGenerator::writeInputLine(AutoConnection & conn,
     Graph & graph, Graph::Arc * arc, std::ofstream & file,
     Map <long, PlantLocation> & mapPlantLocation,
@@ -178 +179 @@
     if (ptrCiiu == NULL) {
 
-        std::string ciiu = getCiiu(rif);
+        std::string ciiu = getCiiu(conn, rif);
 
         ptrCiiu = mapCompanyCiiu.insert(rif, ciiu);
@@ -214 +215 @@
     const real amount = quantity * arc->get_info().price;
 
-    real employment = computeGeneratedEmployment(node, rif, year, amount);
+    real employment = computeGeneratedEmployment(conn, node, rif, year, amount);
 
     char sep = 0;
@@ -261 +262 @@
 
 bool ProductionIndicatorGenerator::writeProductInputsIndicators(
+    AutoConnection & conn,
     Graph & graph, const std::string & path, const std::string & year) {
 
@@ -354 +356 @@
             node->get_info()->getType() == INPUT_GOOD) {
 
-            writeProductLine(node, file, mapPlantLocation, mapCompanyCiiu);
+            writeProductLine(conn, node, file, mapPlantLocation,
+                             mapCompanyCiiu);
 
             writeEmptyInput(file);
@@ -371 +374 @@
                 continue;
 
-            writeProductLine(node, file, mapPlantLocation, mapCompanyCiiu);
-
-            writeInputLine(graph, arc, file, mapPlantLocation,
+            writeProductLine(conn, node, file, mapPlantLocation,
+                             mapCompanyCiiu);
+
+            writeInputLine(conn, graph, arc, file, mapPlantLocation,
                            mapCompanyCiiu, year);
         }
@@ -384 +388 @@
 }
 
-void ProductionIndicatorGenerator::writeProductionInfo(Graph & graph,
+void ProductionIndicatorGenerator::writeProductionInfo(AutoConnection & conn,
+                                                       Graph & graph,
                                                        Graph::Node * node,
                                                        const std::string & year,
@@ -490 +495 @@
 
     real generatedEmployment =
-        computeGeneratedEmployment(node, COMPANY(good)->getRif(), year,
+        computeGeneratedEmployment(conn, node, COMPANY(good)->getRif(), year,
                                    amountDiff);
 
@@ -513 +518 @@
 }
 
-bool ProductionIndicatorGenerator::writeProductIndicators(
+bool ProductionIndicatorGenerator::writeProductIndicators(AutoConnection & conn,
     Graph & graph, const std::string & path, const std::string & year) {
 
@@ -610 +615 @@
             continue;
 
-        writeProductLine(node, file, mapPlantLocation, mapCompanyCiiu);
-
-        writeProductionInfo(graph, node, year, file);
+        writeProductLine(conn, node, file, mapPlantLocation, mapCompanyCiiu);
+
+        writeProductionInfo(conn, graph, node, year, file);
     }
 
@@ -624 +629 @@
                                                    const std::string & year) {
 
-    bool res = writeProductInputsIndicators(graph, path, year);
-
-    res = res and writeProductIndicators(graph, path, year);
+    AutoConnection conn;
+
+    bool res = writeProductInputsIndicators(conn, graph, path, year);
+
+    res = res and writeProductIndicators(conn, graph, path, year);
 
     if (not res)

simulacion/SimEscenariosEconomicos/indicatorGenerator.H

@@ -74 +74 @@
      * @param mapPlantLocation buffer con ciiu de las empresas.
      */
-     void writeProductLine(Graph::Node * node, std::ofstream & file,
+     void writeProductLine(AutoConnection & conn,
+                           Graph::Node * node, std::ofstream & file,
                            Map <long, PlantLocation> & mapPlantLocation,
                            Map <std::string, std::string> &
@@ -86 +87 @@
      * @param mapPlantLocation buffer con ciiu de las empresas.
      */
-    void writeInputLine(Graph & graph,
+    void writeInputLine(AutoConnection & conn, Graph & graph,
                         Graph::Arc * arc, std::ofstream & file,
                         Map <long, PlantLocation> & mapPlantLocation,
@@ -105 +106 @@
      * @param fileName nombre del archivo sobre el cual se va a escribir.
      */
-    bool writeProductInputsIndicators(Graph & graph, const std::string & path,
+    bool writeProductInputsIndicators(AutoConnection & conn, Graph & graph,
+                                      const std::string & path,
                                       const std::string & year);
 
-    void writeProductionInfo(Graph & graph, Graph::Node * node,
-                             const std::string & year, std::ofstream & file);
+    void writeProductionInfo(AutoConnection & conn, Graph & graph,
+                             Graph::Node * node, const std::string & year,
+                             std::ofstream & file);
 
-    bool writeProductIndicators(Graph & graph, const std::string & path,
+    bool writeProductIndicators(AutoConnection & conn, Graph & graph,
+                                const std::string & path,
                                 const std::string & year);
 

simulacion/SimEscenariosEconomicos/ioManager.H

@@ -379 +379 @@
      *         recorrido en amplitud.
      */
-    void buildGraphUpstream(Graph & g, DynListQueue <Graph::Node *> & queue,
+    void buildGraphUpstream(AutoConnection & conn, Graph & g,
+                            DynListQueue <Graph::Node *> & queue,
                             const size_t & maxLevelUpstream,
                             const std::string & year, size_t & numNodes) {
@@ -397 +398 @@
             List <size_t> inputsIds;
 
-            listInputIds(good->getId(), year, inputsIds);
+            listInputIds(conn, good->getId(), year, inputsIds);
 
             for (List <size_t>::Iterator iit(inputsIds); iit.has_current();
@@ -406 +407 @@
                 List <InputInfo> inputs;
 
-                listInputs(inputId, year, inputs);
+                listInputs(conn, inputId, year, inputs);
 
                 for (List <InputInfo>::Iterator it(inputs);
@@ -415 +416 @@
                     List <ProductInfo> products;
 
-                    productInfoFromInput(input, products);
+                    productInfoFromInput(conn, input, products);
 
                     bool isInput = false;
@@ -486 +487 @@
                         } else {
 
-                            getProducedQuantityAndPrice(productInfo, year);
+                            getProducedQuantityAndPrice(conn, productInfo,
+                                                        year);
 
                             ptrSrc = productMap.search(productInfo.productId);
@@ -504 +506 @@
 
                         arcInfo.price =
-                            getAcquisitionPrice(src->get_info().get(),
+                            getAcquisitionPrice(conn, src->get_info().get(),
                                                 input.id, year);
                         arcInfo.inputId = input.id;
 
-                        setArcMeasurementUnit(arcInfo);
+                        setArcMeasurementUnit(conn, arcInfo);
 
                         arcInfo.reqQuantity =
-                            getUnitarianRequest(arcInfo.inputId,
+                            getUnitarianRequest(conn, arcInfo.inputId,
                                                 tgt->get_info()->getId());
 
-                        computeArcQuantityUpstream(src->get_info().get(),
+                        computeArcQuantityUpstream(conn, src->get_info().get(),
                                                    tgt->get_info().get(),
                                                    year, arcInfo);
@@ -708 +710 @@
      *         recorrido en amplitud.
      */
-     void buildGraphDownstream(Graph & g, DynListQueue <Graph::Node *> & queue,
+     void buildGraphDownstream(AutoConnection & conn, Graph & g,
+                               DynListQueue <Graph::Node *> & queue,
                                const size_t & maxLevelDownstream,
                                const std::string & year, size_t & numNodes) {
@@ -724 +727 @@
                 computeNodeQuantity(g, src);
                 computeUsageInputQuantities(g, src);
-                getProducedQuantityAndPrice(good, year);
+                getProducedQuantityAndPrice(conn, good, year);
             }
 
             List <Aleph::pair<ProductInfo, long>> requesters;
-            listRequesters(good, year, requesters);
+            listRequesters(conn, good, year, requesters);
 
             Tree <long> & levels = src->levels;
@@ -758 +761 @@
                 arcInfo.inputId = currentPair.second;
 
-                setArcMeasurementUnit(arcInfo);
+                setArcMeasurementUnit(conn, arcInfo);
 
                 arcInfo.reqQuantity =
-                    getUnitarianRequest(arcInfo.inputId,
+                    getUnitarianRequest(conn, arcInfo.inputId,
                                         tgt->get_info()->getId());
 
                 arcInfo.price =
-                    getAcquisitionPrice(src->get_info().get(),
+                    getAcquisitionPrice(conn, src->get_info().get(),
                                         arcInfo.inputId, year);
 
-                computeArcQuantityDownstream(good, tgt->get_info().get(),
+                computeArcQuantityDownstream(conn, good, tgt->get_info().get(),
                                              year, arcInfo);
 
@@ -779 +782 @@
                     computeNodeQuantity(g, tgt);
                     computeUsageInputQuantities(g, tgt);
-                    getProducedQuantityAndPrice(tgt->get_info().get(), year);
+                    getProducedQuantityAndPrice(conn, tgt->get_info().get(),
+                                                year);
                 }
             }
@@ -815 +819 @@
         DynListQueue <Graph::Node *> downstreamQueue;
 
+        AutoConnection conn;
+
         for (size_t i = 0; i < roots.size(); ++i) {
 
             const size_t & id = roots.access(i);
 
-            ProductInfo info = loadInfoByProductId(id);
+            ProductInfo info = loadInfoByProductId(conn, id);
 
             if (info.productId == -1) {
@@ -830 +836 @@
             }
 
-            getProducedQuantityAndPrice(info, year);
+            getProducedQuantityAndPrice(conn, info, year);
 
             info.quantity = info.totalQuantity;
@@ -844 +850 @@
 
         if (maxLevelUpstream > 0) 
-            buildGraphUpstream(g, upstreamQueue, maxLevelUpstream, year,
+            buildGraphUpstream(conn, g, upstreamQueue, maxLevelUpstream, year,
                                numNodes);
 
         if (maxLevelDownstream > 0)
-            buildGraphDownstream(g, downstreamQueue, maxLevelDownstream, year,
-                                 numNodes);
+            buildGraphDownstream(conn, g, downstreamQueue, maxLevelDownstream,
+                                 year, numNodes);
     }
 

simulacion/SimEscenariosEconomicos/queries.C

@@ -35 +35 @@
 # include <queries.H>
 # include <dbQuery.H>
-# include <autoConnection.H>
 
 # include <strQuery.H>
@@ -93 +92 @@
 }
 
-ProductInfo loadInfoByProductId(const size_t & id) {
-
-    AutoConnection conn;
+ProductInfo loadInfoByProductId(AutoConnection & conn, const size_t & id) {
 
     DBQuery query(conn);
@@ -171 +168 @@
 }
 
-void listInputIds(const size_t & productId, const std::string & year,
-                  List <size_t> & inputIds) {
-
-    AutoConnection conn;
+void listInputIds(AutoConnection & conn, const size_t & productId,
+                  const std::string & year, List <size_t> & inputIds) {
 
     DBQuery query(conn);
@@ -197 +192 @@
 }
 
-void listInputs(const size_t & inputId, const std::string & year,
-                List <InputInfo> & inputs) {
-
-    AutoConnection conn;
+void listInputs(AutoConnection & conn, const size_t & inputId,
+                const std::string & year, List <InputInfo> & inputs) {
 
     DBQuery query(conn);
@@ -315 +308 @@
         long supplierId = std::atol(query.getValue(0));
 
-        inputInfo.origCountry = getOrigCountry(supplierId);
-        inputInfo.procCountry = getProcCountry(supplierId);
+        inputInfo.origCountry = getOrigCountry(conn, supplierId);
+        inputInfo.procCountry = getProcCountry(conn, supplierId);
 
         inputs.append(inputInfo);
@@ -322 +315 @@
 }
 
-void productInfoFromInput(const InputInfo & inputInfo,
+void productInfoFromInput(AutoConnection & conn, const InputInfo & inputInfo,
                           List <ProductInfo> & list) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -354 +345 @@
 
     while (query.next())
-        list.append(loadInfoByProductId(
+        list.append(loadInfoByProductId(conn,
             std::atol(query.getValue(concat(DB::PRODUCT_TABLE_NAME, DB::ID,
                       '_')))));
 }
 
-void listProductsId(Good * good, const std::string & year,
+void listProductsId(AutoConnection & conn, Good * good,
+                    const std::string & year,
                     List <Aleph::pair<long, long>> & list) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -413 +403 @@
 }
 
-void listRequesters(Good * good, const std::string & year,
+void listRequesters(AutoConnection & conn, Good * good,
+                    const std::string & year,
                     List <Aleph::pair<ProductInfo, long>> & list) {
 
     List <Aleph::pair <long, long>> ids;
 
-    listProductsId(good, year, ids);
+    listProductsId(conn, good, year, ids);
 
     for(List <Aleph::pair<long, long>>::Iterator it(ids); it.has_current();
@@ -425 +416 @@
         Aleph::pair <long, long> & p = it.get_current();
 
-        ProductInfo info = loadInfoByProductId(p.first);
+        ProductInfo info = loadInfoByProductId(conn, p.first);
 
         list.append(Aleph::pair<ProductInfo, long>(info, p.second));
@@ -431 +422 @@
 }
 
-void getProducedQuantityAndPrice(const long & id, const std::string & year,
+void getProducedQuantityAndPrice(AutoConnection & conn, const long & id,
+                                 const std::string & year,
                                  real & producedQuantity, real & price) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -462 +452 @@
 }
 
-void getProducedQuantityAndPrice(Good * good, const std::string & year) {
+void getProducedQuantityAndPrice(AutoConnection & conn, Good * good,
+                                 const std::string & year) {
 
     real producedQuantity = 0.0;
@@ -468 +459 @@
     real price = 0.0;
 
-    getProducedQuantityAndPrice(good->getId(), year, producedQuantity, price);
+    getProducedQuantityAndPrice(conn, good->getId(), year, producedQuantity,
+                                price);
 
     good->setTotalQuantity(producedQuantity);
@@ -475 +467 @@
 }
 
-void getProducedQuantityAndPrice(ProductInfo & info, const std::string & year) {
-
-    getProducedQuantityAndPrice(info.productId, year, info.totalQuantity,
+void getProducedQuantityAndPrice(AutoConnection & conn, ProductInfo & info,
+                                 const std::string & year) {
+
+    getProducedQuantityAndPrice(conn, info.productId, year, info.totalQuantity,
                                 info.unitarianPrice);
 }
 
-real getUnitarianRequest(const size_t & inputId, const size_t & productId) {
-
-    AutoConnection conn;
+real getUnitarianRequest(AutoConnection & conn, const size_t & inputId,
+                         const size_t & productId) {
 
     DBQuery query(conn);
@@ -509 +501 @@
 }
 
-real computeInputProportionFromSupplier(const std::string & supplierRif,
+real computeInputProportionFromSupplier(AutoConnection & conn,
+                                        const std::string & supplierRif,
                                         const std::string & supplierName,
                                         const std::string & nationality,
                                         const size_t & inputId,
                                         const std::string & year) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -565 +556 @@
 }
 
-real computeProportionByTariffCode(const std::string & tariffCode,
+real computeProportionByTariffCode(AutoConnection & conn, 
+                                   const std::string & tariffCode,
                                    const std::string & rif,
                                    const size_t & productId,
                                    const std::string & year) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -626 +616 @@
 }
 
-void computeArcQuantityUpstream(Good * src, Good * tgt,
+void computeArcQuantityUpstream(AutoConnection & conn, Good * src, Good * tgt,
                                 const std::string & year, ArcInfo & info) {
 
@@ -652 +642 @@
 
     real proportionFromSupplier =
-        computeInputProportionFromSupplier(rif, companyName, nationality,
+        computeInputProportionFromSupplier(conn, rif, companyName, nationality,
                                            info.inputId, year);
 
     real proportionByTariffCode =
-        computeProportionByTariffCode(src->getTariffCode(), rif,
+        computeProportionByTariffCode(conn, src->getTariffCode(), rif,
                                       src->getId(), year);
 
@@ -665 +655 @@
 }
 
-real getDeclaredBoughtQuantity(const std::string & rif, const long & inputId,
-                                 const std::string & year) {
-
-    AutoConnection conn;
+real getDeclaredBoughtQuantity(AutoConnection & conn, const std::string & rif,
+                               const long & inputId, const std::string & year) {
 
     DBQuery query(conn);
@@ -703 +691 @@
 }
 
-real computePorportionByProductInput(const long & inputId,
-                                       const size_t & productId,
-                                       const std::string & year) {
-
-    AutoConnection conn;
+real computePorportionByProductInput(AutoConnection & conn, 
+                                     const long & inputId,
+                                     const size_t & productId,
+                                     const std::string & year) {
 
     DBQuery query(conn);
@@ -753 +740 @@
 }
 
-real computeProportionByTartiffCode(const std::string & rif,
-                                      const std::string & tariffCode,
-                                      const long & productId,
-                                      const std::string & year) {
-
-    AutoConnection conn;
+real computeProportionByTartiffCode(AutoConnection & conn,
+                                    const std::string & rif,
+                                    const std::string & tariffCode,
+                                    const long & productId,
+                                    const std::string & year) {
 
     DBQuery query(conn);
@@ -811 +797 @@
 }
 
-void computeArcQuantityDownstream(Good * src, Good * tgt,
+void computeArcQuantityDownstream(AutoConnection & conn, Good * src, Good * tgt,
                                   const std::string & year, ArcInfo & arcInfo) {
 
     real proportionByProductInput =
-        computePorportionByProductInput(arcInfo.inputId, tgt->getId(), year);
+        computePorportionByProductInput(conn, arcInfo.inputId, tgt->getId(),
+                                        year);
 
 
@@ -824 +811 @@
 
     real declaredQuantity =
-        getDeclaredBoughtQuantity(rif, arcInfo.inputId, year);
+        getDeclaredBoughtQuantity(conn, rif, arcInfo.inputId, year);
 
     real proportion = src->getQuantity() / src->getTotalQuantity();
 
     real proportionByTartiffCode =
-        computeProportionByTartiffCode(rif, src->getTariffCode(), src->getId(),
-                                       year);
+        computeProportionByTartiffCode(conn, rif, src->getTariffCode(),
+                                       src->getId(), year);
 
     arcInfo.quantity = declaredQuantity * proportion *
@@ -839 +826 @@
 
     arcInfo.reqQuantity =
-        getUnitarianRequest(arcInfo.inputId, tgt->getId());
-}
-
-real getAcquisitionPrice(Good * good, const long & id,
-                           const std::string & year) {
-
-    AutoConnection conn;
+        getUnitarianRequest(conn, arcInfo.inputId, tgt->getId());
+}
+
+real getAcquisitionPrice(AutoConnection & conn, Good * good, const long & id,
+                         const std::string & year) {
 
     DBQuery query(conn);
@@ -878 +863 @@
 }
 
-std::string getCountry(const long & supplierId, const std::string & field) {
-
-    AutoConnection conn;
+std::string getCountry(AutoConnection & conn, const long & supplierId,
+                       const std::string & field) {
 
     DBQuery query(conn);
@@ -908 +892 @@
 }
 
-std::string getOrigCountry(const long & supplierId) {
-    return getCountry(supplierId, DB::ORIG_COUNTRY_ID);
-}
-
-std::string getProcCountry(const long & supplierId) {
-    return getCountry(supplierId, DB::PROC_COUNTRY_ID);
-}
-
-void listSuggestedSuppliers(const std::string & tariffCode,
+std::string getOrigCountry(AutoConnection & conn, const long & supplierId) {
+    return getCountry(conn, supplierId, DB::ORIG_COUNTRY_ID);
+}
+
+std::string getProcCountry(AutoConnection & conn, const long & supplierId) {
+    return getCountry(conn, supplierId, DB::PROC_COUNTRY_ID);
+}
+
+void listSuggestedSuppliers(AutoConnection & conn,
+                            const std::string & tariffCode,
                             const std::string & year,
                             List<ProductInfo> & list) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -949 +932 @@
         long productId = std::atol(query.getValue(0));
 
-        ProductInfo info = loadInfoByProductId(productId);
-
-        getProducedQuantityAndPrice(info, year);
+        ProductInfo info = loadInfoByProductId(conn, productId);
+
+        getProducedQuantityAndPrice(conn, info, year);
 
         list.append(info);
@@ -957 +940 @@
 }
 
-void listRealProductId(const long & id, const std::string & year,
-                       List<long> & ids) {
-
-    AutoConnection conn;
+void listRealProductId(AutoConnection & conn, const long & id,
+                       const std::string & year, List<long> & ids) {
 
     DBQuery query(conn);
@@ -1000 +981 @@
 }
 
-std::string getInputName(const long & id) {
-
-    AutoConnection conn;
+std::string getInputName(AutoConnection & conn, const long & id) {
 
     DBQuery query(conn);
@@ -1024 +1003 @@
 }
 
-PlantLocation getPlantLocation(const long & id) {
-
-    AutoConnection conn;
+PlantLocation getPlantLocation(AutoConnection & conn, const long & id) {
 
     DBQuery query(conn);
@@ -1071 +1048 @@
 }
 
-std::string getCiiu(const std::string & rif) {
-
-    AutoConnection conn;
+std::string getCiiu(AutoConnection & conn, const std::string & rif) {
 
     DBQuery query(conn);
@@ -1102 +1077 @@
 }
 
-real getOperatingStaffNumber(const std::string & rif,
+real getOperatingStaffNumber(AutoConnection & conn, const std::string & rif,
                              const std::string & year) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -1147 +1120 @@
 }
 
-real getTotalAmount(const std::string & rif, const std::string & year) {
-
-    AutoConnection conn;
+real getTotalAmount(AutoConnection & conn, const std::string & rif,
+                    const std::string & year) {
 
     DBQuery query(conn);
@@ -1192 +1164 @@
 }
 
-void listCompaniesLike(const std::string & company,
+void listCompaniesLike(AutoConnection & conn, const std::string & company,
                        List <CompanyRifName> & list) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -1244 +1214 @@
 }
 
-void listProductsByCompany(const std::string & rif,
+void listProductsByCompany(AutoConnection & conn, const std::string & rif,
                            List <ProductIdName> & list) {
-
-    AutoConnection conn;
 
     DBQuery query(conn);
@@ -1287 +1255 @@
 }
 
-void setArcMeasurementUnit(ArcInfo & info) {
-
-    AutoConnection conn;
+void setArcMeasurementUnit(AutoConnection & conn, ArcInfo & info) {
 
     DBQuery query(conn);
@@ -1317 +1283 @@
 }
 
-void getProductionYears(const long productId, List<std::string> & years) {
-
-    AutoConnection conn;
+void getProductionYears(AutoConnection & conn, const long productId,
+                        List<std::string> & years) {
 
     DBQuery query(conn);

simulacion/SimEscenariosEconomicos/queries.H

@@ -32 +32 @@
 
 # include <common.H>
+# include <autoConnection.H>
 
 /** Encierra una cadena entre comillas simples.
@@ -129 +130 @@
  * @return Objeto ProductInfo con toda la información del producto consultado.
  */
-ProductInfo loadInfoByProductId(const size_t & id);
+ProductInfo loadInfoByProductId(AutoConnection & conn, const size_t & id);
 
 /** Carga la lista de id de los insumos para un producto dado.
@@ -138 +139 @@
  *             de los insumos.
  */
-void listInputIds(const size_t & productId, const std::string & year,
-                  List <size_t> & inputIds);
+void listInputIds(AutoConnection & conn, const size_t & productId,
+                  const std::string & year, List <size_t> & inputIds);
 
 /** Carga a todos los proveedores de un insumo dado.
@@ -147 +148 @@
  * @param[out] Lista de proveedores del insumo.
  */
-void listInputs(const size_t & inputId, const std::string & year,
-                List <InputInfo> & inputs);
+void listInputs(AutoConnection & conn, const size_t & inputId,
+                const std::string & year, List <InputInfo> & inputs);
 
 
@@ -157 +158 @@
  * @param[out] Lista de productos asociados al insumo.
  */
-void productInfoFromInput(const InputInfo & inputInfo,
+void productInfoFromInput(AutoConnection & conn, const InputInfo & inputInfo,
                           List <ProductInfo> & list);
 
@@ -168 +169 @@
  *              junto al id que se le asocia como insumo a good por cada uno.
  */
-void listRequesters(Good * good, const std::string & year,
+void listRequesters(AutoConnection & conn, Good * good,
+                    const std::string & year,
                     List <Aleph::pair<ProductInfo, long>> & list);
 
@@ -178 +180 @@
  * @return cantidad de insumo para producir una unidad de producto.
  */
-real getUnitarianRequest(const size_t & inputId, const size_t & productId);
+real getUnitarianRequest(AutoConnection & conn, const size_t & inputId,
+                         const size_t & productId);
 
 /** Carga la cantidad producida y el precio de un producto en un año dado.
@@ -186 +189 @@
  * @param year año de la producción.
  */
-void getProducedQuantityAndPrice(Good * good, const std::string & year);
+void getProducedQuantityAndPrice(AutoConnection & conn, Good * good,
+                                 const std::string & year);
 
 
@@ -195 +199 @@
  * @param year año de la producción.
  */
-void getProducedQuantityAndPrice(ProductInfo & info, const std::string & year);
+void getProducedQuantityAndPrice(AutoConnection & conn, ProductInfo & info,
+                                 const std::string & year);
 
 /** Calcula la cantidad que se le debe asignar a un arco que va hacia aguas
@@ -205 +210 @@
  * @param[out] info Referencia a la información del arco
  */
-void computeArcQuantityUpstream(Good * src, Good * tgt,
+void computeArcQuantityUpstream(AutoConnection & conn, Good * src, Good * tgt,
                                 const std::string & year, ArcInfo & info);
 
@@ -215 +220 @@
  * @return cantidad de insumo declarado.
  */
-real getDeclaredBoughtQuantity(const std::string & rif, const long & inputId,
-                                 const std::string & year);
+real getDeclaredBoughtQuantity(AutoConnection & conn, const std::string & rif,
+                               const long & inputId, const std::string & year);
 
 /** Calcula la cantidad que se le debe asignar a un arco que va hacia aguas
@@ -227 +232 @@
  * @param[in] year año de la relación.
  */
-void computeArcQuantityDownstream(Good * src, Good * tgt,
+void computeArcQuantityDownstream(AutoConnection & conn, Good * src, Good * tgt,
                                   const std::string & year, ArcInfo & arcInfo);
 
@@ -238 +243 @@
  * @return precio de compra del insumo.
  */
-real getAcquisitionPrice(Good * good, const long & id,
-                           const std::string & year);
+real getAcquisitionPrice(AutoConnection & conn, Good * good, const long & id,
+                         const std::string & year);
 
 /** Consulta el país de origen de una empresa.
@@ -246 +251 @@
  * @return nombre del país de origen.
  */
-std::string getOrigCountry(const long & supplierId);
+std::string getOrigCountry(AutoConnection & conn, const long & supplierId);
 
 /** Consulta el país de procedencia de una empresa.
@@ -253 +258 @@
  * @return nombre del país de procedencia.
  */
-std::string getProcCountry(const long & supplierId);
+std::string getProcCountry(AutoConnection & conn, const long & supplierId);
 
 /** Carga una lista de posibles proveedores para un insumo.
@@ -261 +266 @@
  * @param[out] list Lista de posibles proveedores.
  */
-void listSuggestedSuppliers(const std::string & tariffCode,
+void listSuggestedSuppliers(AutoConnection & conn,
+                            const std::string & tariffCode,
                             const std::string & year,
                             List<ProductInfo> & list);
@@ -271 +277 @@
  * @param[out] ids lista de id de los productos.
  */
-void listRealProductId(const long & id, const std::string & year,
-                       List<long> & ids);
+void listRealProductId(AutoConnection & conn, const long & id,
+                       const std::string & year, List<long> & ids);
 
 /** Consulta el nombre de un insumo.
@@ -279 +285 @@
  * @return nombre del insumo.
  */
-std::string getInputName(const long & id);
+std::string getInputName(AutoConnection & conn, const long & id);
 
 /** Consulta la ubicación de una planta.
@@ -293 +299 @@
  * @return valor del CIIU de la actividad económica.
  */
-std::string getCiiu(const std::string & rif);
+std::string getCiiu(AutoConnection & conn, const std::string & rif);
 
 /** Consulta la cantidad de emplados operativos de una unidad económica.
@@ -301 +307 @@
  *  @return cantidad de empleados en la unidad económica.
  */
-real getOperatingStaffNumber(const std::string & rif, const std::string & year);
+real getOperatingStaffNumber(AutoConnection & conn, const std::string & rif,
+                             const std::string & year);
 
 /** Consulta el monto total producido por una empresa en un año dado.
@@ -309 +316 @@
  *  @return monto total producido por la empresa.
  */
-real getTotalAmount(const std::string & rif, const std::string & year);
+real getTotalAmount(AutoConnection & conn, const std::string & rif,
+                    const std::string & year);
 
 /** Extrae los años para los cuales existe una producción.
@@ -316 +324 @@
  * @param[out] years Lista de años para los cuales hay producción declarada.
  */
-void getProductionYears(const long productId, List<std::string> & years);
+void getProductionYears(AutoConnection & conn, const long productId,
+                        List<std::string> & years);
 
 struct CompanyRifName {
@@ -329 +338 @@
  * @param[out] list Lista de pares (rif, nombre) de cada empresa coincidente.
  */
-void listCompaniesLike(const std::string & company,
+void listCompaniesLike(AutoConnection & conn, const std::string & company,
                        List <CompanyRifName> & list);
 
@@ -345 +354 @@
  * @param[out] list Lista de pares (id, nombre) de cada cada producto.
  */
-void listProductsByCompany(const std::string & rif,
+void listProductsByCompany(AutoConnection & conn, const std::string & rif,
                            List <ProductIdName> & list);
 
-void setArcMeasurementUnit(ArcInfo & info);
+void setArcMeasurementUnit(AutoConnection & conn, ArcInfo & info);
 
 # endif // QUERIES_H

simulacion/SimEscenariosEconomicos/simulator.C

@@ -607 +607 @@
 struct MakeSuggestions {
 
+    AutoConnection & conn;
+
     Graph & g;
 
@@ -619 +621 @@
     ArcsIndex & arcsIndex;
 
-    MakeSuggestions(Graph & _g, Graph::Node * _tgt, SuggestionBuffer & _buffer,
+    MakeSuggestions(AutoConnection & _conn,
+                    Graph & _g, Graph::Node * _tgt, SuggestionBuffer & _buffer,
                     const std::string & _year, MapProductNode & _mapProductNode,
                     ArcsIndex & _arcsIndex)
-        : g(_g), tgt(_tgt), buffer(_buffer), year(_year),
+        : conn(_conn), g(_g), tgt(_tgt), buffer(_buffer), year(_year),
           mapProductNode(_mapProductNode), arcsIndex(_arcsIndex) {
 
@@ -639 +642 @@
             ptrSuggestions = buffer.insert(group.tariffCode, SuggestionList());
 
-            listSuggestedSuppliers(group.tariffCode, year, *ptrSuggestions);
+            listSuggestedSuppliers(conn, group.tariffCode, year,
+                                   *ptrSuggestions);
         }
 
@@ -647 +651 @@
         List <long> ids;
 
-        listRealProductId(id, year, ids);
+        listRealProductId(conn, id, year, ids);
 
         for (SuggestionList::Iterator it(*ptrSuggestions); it.has_current(); ){
@@ -778 +782 @@
 struct SuggestImport {
 
+    AutoConnection & conn;
+
     Graph & g;
 
@@ -784 +790 @@
     MapImports & map;
 
-    SuggestImport(Graph & _g, Graph::Node * _tgt, MapImports & _map)
-        : g(_g), tgt(_tgt), map(_map) {
+    SuggestImport(AutoConnection & _conn,
+                  Graph & _g, Graph::Node * _tgt, MapImports & _map)
+        : conn(_conn), g(_g), tgt(_tgt), map(_map) {
 
         // Empty
@@ -802 +809 @@
 
             input->setQuantity(group.neededQuantity);
-            input->setName(getInputName(id));
+            input->setName(getInputName(conn, id));
 
             Company company;
@@ -882 +889 @@
     queue.put(start);
 
+    AutoConnection conn;
+
     while (not queue.is_empty()) {
 
@@ -900 +909 @@
         mapGroupArcs.for_each(PutSuppliersInQueue(g, queue));
 
-        mapGroupArcs.for_each(MakeSuggestions(g, p, buffer, year,
+        mapGroupArcs.for_each(MakeSuggestions(conn, g, p, buffer, year,
                                               mapProductNode, arcsIndex));
 
-        mapGroupArcs.for_each(SuggestImport(g, p, mapImports));
+        mapGroupArcs.for_each(SuggestImport(conn, g, p, mapImports));
 
     }