Changeset 76e705a in observatorio

Timestamp:

Nov 5, 2014, 4:35:48 PM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

74b22f6

Parents:

80d314e

Message:

Agregada a los graficos la leyenda con los parametros bajo los cuales son generados

Location:

simulacion/SimEscenariosEconomicos

Files:

• common.C (modified) (2 diffs)
• common.H (modified) (1 diff)
• ioManager.H (modified) (5 diffs)
• productionNetwork.H (modified) (1 diff)
• svg_sigesic_builder.pyc (added)
• test_wrapper.gv (added)

simulacion/SimEscenariosEconomicos/common.C

@@ -28 +28 @@
 */
 
-# include <assert.h>
+# include <ctime>
+# include <cassert>
 # include <cstring>
 
@@ -306 +307 @@
 }
 
+std::string currentTime()
+{
+  time_t now = time(0);
+
+  struct tm * st_now = localtime(&now);
+
+  std::stringstream sstr;
+
+  sstr << st_now->tm_mday << "/" << st_now->tm_mon + 1 << "/"
+       << st_now->tm_year + 1900 << " " << st_now->tm_hour << ":"
+       << st_now->tm_min << ":" << st_now->tm_sec;
+
+  return sstr.str();
+}
+

simulacion/SimEscenariosEconomicos/common.H

@@ -319 +319 @@
 }
 
+std::string currentTime();
+
 # endif // COMMON_H
 

simulacion/SimEscenariosEconomicos/ioManager.H

@@ -805 +805 @@
         readFields(fileName, roots, maxLevelUpstream, maxLevelDownstream, year);
 
+        g.year = year;
+
+        g.maxLevelUpstream = maxLevelUpstream;
+
+        g.maxLevelDownstream = maxLevelDownstream;
+
         DynListQueue <Graph::Node *> upstreamQueue;
 
@@ -931 +937 @@
         xmlpp::Element * graph = root->add_child(graphName);
 
+        graph->set_attribute(YEAR, g.year);
+
+        graph->set_attribute(UP, toStr(g.maxLevelUpstream));
+
+        graph->set_attribute(DOWN, toStr(g.maxLevelDownstream));
+
         xmlpp::Element * nodes = graph->add_child(NODES);
 
@@ -1066 +1078 @@
 
         xmlpp::Element * nodeGraph = searchXmlElementByName(root, graphName);
+
+        g.year = nodeGraph->get_attribute_value(YEAR);
+
+        g.maxLevelUpstream =
+            std::atol(nodeGraph->get_attribute_value(UP).c_str());
+
+        g.maxLevelDownstream =
+            std::atol(nodeGraph->get_attribute_value(DOWN).c_str());
 
         assert(nodeGraph != NULL);
@@ -2144 +2164 @@
         output << "digraph\n"
                << "{\n"
-               << "  rankdir = LR;\n\n";
+               << "  rankdir = LR;\n\n"
+               << "  label = \"Red generada el: " << currentTime() << "\\n"
+               << "Año de estudio: " << g.year << "\\n"
+               << "Niveles aguas arriba solicitados: " << g.maxLevelUpstream
+               << "\\nNiveles aguas abajo solicitados: " << g.maxLevelDownstream 
+               << "\"\n";
 
         // Escribir nodos clusterizados por planta.
@@ -2226 +2251 @@
 
     template <class NodeLabel = NodeLabel, class ArcLabel = ArcLabel>
-    void generateDot(Graph & g, const std::string & fileName,
-                     bool writeHref = false,
+    void generateDot(Graph & g, const std::string & fileName, bool writeHref = false,
                      NodeLabel && nodeLabel = NodeLabel(),
                      ArcLabel && arcLabel = ArcLabel()) {

simulacion/SimEscenariosEconomicos/productionNetwork.H

@@ -157 +157 @@
 
 public:
+    std::string year;
+
+    size_t maxLevelUpstream;
+
+    size_t maxLevelDownstream;
+
     ProductionNetwork()
         : BaseGraph(), companies(), plants() {