Changeset 52 for sources/src/graph_signals.cc

Timestamp:

Jan 22, 2013, 4:23:22 PM (12 years ago)

Author:

meunier

Message:

Code formatting in all source files.

File:

• sources/src/graph_signals.cc (modified) (3 diffs)

sources/src/graph_signals.cc

@@ -1 +1 @@
 /*------------------------------------------------------------\
-|                                                             |
-| Tool    :                  systemcass                       |
-|                                                             |
-| File    :                 graph_signals.cc                  |
-|                                                             |
-| Author  :                 Buchmann Richard                  |
-|                                                             |
-| Date    :                   22_09_2004                      |
-|                                                             |
-\------------------------------------------------------------*/
+  |                                                             |
+  | Tool    :                  systemcass                       |
+  |                                                             |
+  | File    :                 graph_signals.cc                  |
+  |                                                             |
+  | Author  :                 Buchmann Richard                  |
+  |                                                             |
+  | Date    :                   22_09_2004                      |
+  |                                                             |
+  \------------------------------------------------------------*/
 
 /* 
@@ -138 +138 @@
 #include "sc_module.h"
 #include "sc_port.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -146 +147 @@
 namespace sc_core {
 
-#if 0
-static
-ostream& operator << (ostream&      o,
-                      const Vertex &v)
-{
-        equi_t* m = (equi_t*)(v.data);
-  if (v.arcs == NULL)
-          o << get_name(*m) << "\n";
-  Arc *a;
-  for (a = v.arcs; a; a = a->next)
-        {
-          equi_t* m2 = (equi_t*)(a->tip->data);
-          o << get_name(*m) << "->"
-                  << get_name(*m2) << "\n";
-        }
-  return o;
-
-}
-
-static
-ostream& 
-operator << (ostream     &o,
-             const Graph &g)
-{
-  Vertex *v;
-  int     i = 1;
-  for (v = g.vertices; v < g.vertices + g.n; ++v) {
-    o << i++ << " : " << *v;
-  }
-  return o;
-}
-#endif
-
-typedef std::map<const equi_t*, Vertex*> nodes_set_t;
-
-void
-create_arcs (const SignalDependencyGraph& sig_g, nodes_set_t& s)
-{
-  SignalDependencyGraph::const_iterator j;
-  for (j = sig_g.begin(); j != sig_g.end(); ++j) { 
-    new_arc (s[j->source],s[j->destination]);
-  }
-}
-
-void
-create_vertices_list (Graph *g, nodes_set_t& s)
-{
-        Vertex *v = g->vertices;
-  if (v == NULL)
-    return;
-  nodes_set_t::iterator j;
-  for (j = s.begin(); j != s.end(); ++j) 
-  {
-                v->data   = (void*) (j->first);
-                j->second = v++;
-        }       
-}
-
-nodes_set_t*
-create_nodes_set (const SignalDependencyGraph& sig_g)
-{
-        /* Create a signal set */
-        nodes_set_t &s = *(new nodes_set_t);
-
-  SignalDependencyGraph::const_iterator j;
-  for (j = sig_g.begin(); j != sig_g.end(); ++j) 
-  {
-                s[j->source] = NULL;
-                s[j->destination] = NULL;
-  }
-        return &s;
-}
+
+typedef std::map < const equi_t *, Vertex * >nodes_set_t;
+
+void create_arcs(const SignalDependencyGraph & sig_g, nodes_set_t & s) {
+   SignalDependencyGraph::const_iterator j;
+   for (j = sig_g.begin(); j != sig_g.end(); ++j) {
+      new_arc(s[j->source], s[j->destination]);
+   }
+}
+
+
+void create_vertices_list(Graph * g, nodes_set_t & s) {
+   Vertex * v = g->vertices;
+   if (v == NULL) {
+      return;
+   }
+   nodes_set_t::iterator j;
+   for (j = s.begin(); j != s.end(); ++j) {
+      v->data = (void *) (j->first);
+      j->second = v++;
+   }
+}
+
+
+nodes_set_t * create_nodes_set(const SignalDependencyGraph & sig_g) {
+   /* Create a signal set */
+   nodes_set_t & s = *(new nodes_set_t);
+
+   SignalDependencyGraph::const_iterator j;
+   for (j = sig_g.begin(); j != sig_g.end(); ++j) {
+      s[j->source] = NULL;
+      s[j->destination] = NULL;
+   }
+   return &s;
+}
+
 
 /* Construit le graph de dépendance des signaux de Mealy */
 /* g = Mealy signal dependancy graph */
-Graph *makegraph(const SignalDependencyGraph& sig_g)
-{
-  int         n = 0; /* Number of vertices */
-  Graph      *g;
-  //Vertex     *v;
-  
-        /* Create node set */
-        nodes_set_t *sig_s = create_nodes_set (sig_g);
-
-  /* Compute the number of vertices in the graph */
-  n = sig_s->size();
-  
-  /* Create the graph */
-  g = gb_new_graph(n);
-
-  /* Associate the netlist elements to the graph vertices, and vice-versa */
-//  v = g->vertices;
-
-        /* Create the node set */
-  create_vertices_list (g,*sig_s);
-
-  /* initialisation des vertices */
-        create_arcs (sig_g,*sig_s);
-
-        delete sig_s;
-#if 0
-        cerr << *g << "\n";
-#endif
-  return g;
-}   
+Graph * makegraph(const SignalDependencyGraph & sig_g) {
+   int n = 0; /* Number of vertices */
+   Graph * g;
+
+   /* Create node set */
+   nodes_set_t * sig_s = create_nodes_set(sig_g);
+
+   /* Compute the number of vertices in the graph */
+   n = sig_s->size();
+
+   /* Create the graph */
+   g = gb_new_graph(n);
+
+   /* Create the node set */
+   create_vertices_list(g, *sig_s);
+
+   /* initialisation des vertices */
+   create_arcs(sig_g, *sig_s);
+
+   delete sig_s;
+
+   return g;
+}
 
 } // end of sc_core namespace
 
+/*
+# Local Variables:
+# tab-width: 4;
+# c-basic-offset: 4;
+# c-file-offsets:((innamespace . 0)(inline-open . 0));
+# indent-tabs-mode: nil;
+# End:
+#
+# vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+*/
+
+