Changeset 209ac10 in observatorio for simulacion/SimEscenariosEconomicos

Timestamp:

Jul 15, 2014, 10:55:27 AM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

4ce7106

Parents:

560bc4d

Message:

Cambio de rama

Location:

simulacion/SimEscenariosEconomicos

Files:

• graph_builder.C (modified) (2 diffs)
• libEcosim.a (added)
• svg_builder.C (modified) (5 diffs)

simulacion/SimEscenariosEconomicos/graph_builder.C

@@ -193 +193 @@
     }
 
-    DBProperties::getInstance().readFile(Fields::dbFileName);
-
     IOManager ioManager;
 
@@ -200 +198 @@
 
     try {
+
+        DBProperties::getInstance().readFile(Fields::dbFileName);
 
         ioManager.buildGraph(Fields::xmlInputFileName, graph);

simulacion/SimEscenariosEconomicos/svg_builder.C

@@ -17 +17 @@
 # include <tpl_dynDlist.H>
 
+# include <dbProperties.H>
 # include <ioManager.H>
 # include <process.H>
@@ -168 +169 @@
 
  
- 
   if (argp_parse (&argp_s, argc, argv, 0/*ARGP_LONG_ONLY*/,0, &arguments) != 0)
                 return 0;
@@ -174 +174 @@
   int lvsUp = arguments.levelsup;
   int lvsDown = arguments.levelsdown;
+
+  DBProperties & dbProp = DBProperties::getInstance();
+
+  dbProp.setHost(arguments.host);
+  dbProp.setPort(arguments.port);
+  dbProp.setDbname(arguments.dbname);
+  dbProp.setUser(arguments.username);
+  dbProp.setPassword(arguments.password);
   
   if (arguments.verbose) {
-      std::cout << "Creando temp.db...\n";
-  }
-
-  std::ofstream file("temp.db");
-  
-  file << arguments.host << "\n";
-  file << arguments.port << "\n";
-  file << arguments.dbname << "\n";
-  file << arguments.username << "\n";
-  file << arguments.password;
-
-  if (arguments.verbose) {
-      std::cout << "temp.db Creado.\n";
-  }
-
-  file.close();
-
-  if (arguments.verbose) {
       std::cout << "Llenando lista de argumentos...\n";
   }
@@ -200 +190 @@
 
   for (size_t i = 0; i < arguments.num_values - 1; ++i) {
-
       ids.append(std::atol(arguments.values[i]));
-
   }
 
@@ -215 +203 @@
   std::string gvOutputFileName = baseName + ".gv";
 
-  std::string arg2 = "-s";
-  arg2.append(svgOutputFileName);
-
-  std::string arg3 = "-g";
-  arg3.append(gvOutputFileName);
+  const char * const xmlRoots = "temp.xml";
 
   IOManager ioManager;
 
   if (arguments.verbose) {
-      std::cout << "Creando temp.xml...\n";
-  }
-
-  ioManager.createXmlRootsFile(arguments.year, ids, lvsUp, lvsDown, "temp.xml");
+      std::cout << "Creando " << xmlRoots << "...\n";
+  }
+
+  ioManager.createXmlRootsFile(arguments.year, ids, lvsUp, lvsDown, xmlRoots);
 
   if (arguments.verbose) {
-      std::cout << "temp.xml creado.\n";
-  }
-
-  char * path = "ecosim_graph_builder";
-
-  size_t numArgs = 5;
-
-  char * args[] =  { "ecosim_graph_builder", "-itemp.xml", "-btemp.db",
-                     (char *) arg2.c_str(), (char *) arg3.c_str(), 0, 0 };
-
-  if (arguments.verbose) {
-      args[5] = "-v";
-      ++numArgs;
-  }
-
-  if (arguments.verbose) {
-      std::cout << "Ejecutando " << path;
-
-      for (size_t i = 1; i < numArgs; ++i) {
-          std::cout << " " << args[i];
-      }
-
-      std::cout << "\n";
-  }
-
-  int retVal = Process::exec(path, args);
-
-  if (retVal != 0) {
-      std::cout << "Error ejecutando\n";
-  } else if (arguments.verbose) {
-      std::cout << "Listo.\n";
-  }
-
-  remove("temp.db");
-
-  remove("temp.xml");
-  
- return retVal;
+      std::cout << xmlRoots << " creado.\n";
+  }
+
+  try {
+
+      Graph graph;
+
+      if (arguments.verbose) {
+          std::cout << "Construyendo red...\n";
+      }
+
+      ioManager.buildGraph(xmlRoots, graph);
+
+      if (arguments.verbose) {
+          std::cout << "Red construída\n";
+      }
+
+      if (arguments.verbose) {
+          std::cout << "Eliminando " << xmlRoots << "...\n";
+      }
+
+      remove(xmlRoots);
+
+      if (arguments.verbose) {
+          std::cout << xmlRoots << " eliminado.\n";
+      }
+
+      std::string dotFileName = "temp.dot";
+
+      if (arguments.verbose) {
+          std::cout << "Generando " << dotFileName << "...\n";
+      }
+
+      ioManager.generateDot<IOManager::NodeLabel, IOManager::ArcLabel>
+         (graph, dotFileName);
+
+      if (arguments.verbose) {
+          std::cerr << dotFileName << " generado.\n";
+      }
+
+      int returnValue = 0;
+
+      char const * path = "dot";
+
+      char * args[] = {"dot", "", (char *) dotFileName.c_str(), "-o", "", 0};
+
+      args[1] = "-Tsvg";
+      args[4] = (char *) svgOutputFileName.c_str();
+
+      if (arguments.verbose) {
+          std::cout << "Generando " << svgOutputFileName << "...\n";
+      }
+
+      returnValue = Process::exec(path, args);
+
+      if (returnValue == 0) {
+          if (arguments.verbose) {
+              std::cerr << svgOutputFileName << " generado.\n";
+          }
+      } else {
+          std::cout << "Error generando " << svgOutputFileName << "\n";
+      }
+
+      args[1] = "-Tgv";
+      args[4] = (char *) gvOutputFileName.c_str();
+
+      if (arguments.verbose) {
+          std::cout << "Generando " << gvOutputFileName << "...\n";
+      }
+
+      returnValue = Process::exec(path, args);
+
+      if (returnValue == 0) {
+           if (arguments.verbose) {
+               std::cerr << gvOutputFileName << " generado.\n";
+           }
+      } else {
+          std::cout << "Error generando " << gvOutputFileName << "\n";
+      }
+
+
+      if (arguments.verbose) {
+          std::cout << "Eliminando " << dotFileName << "...\n";
+      }
+
+      remove(dotFileName.c_str());
+
+      if (arguments.verbose) {
+          std::cerr << dotFileName << " eliminado.\n";
+      }
+
+  } catch (const std::exception & e) {
+      std::cout << "Excepción capturada: " << e.what() << std::endl;
+      return 1;
+  }
+
+  return 0;
 }