Mercurial Mercurial > jpelkey3 > BRITE / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add brite namespace
authorJosh Pelkey <jpelkey@gatech.edu>
Tue, 22 Feb 2011 13:17:57 -0500
changeset 5 c1aaccf37374
parent 4 caa0cdcf1e43
child 6 2f50de60d489
add brite namespace
Brite.h file | annotate | diff | comparison | revisions
BriteMain.cc file | annotate | diff | comparison | revisions
Edge.cc file | annotate | diff | comparison | revisions
Edge.h file | annotate | diff | comparison | revisions
Graph.cc file | annotate | diff | comparison | revisions
Graph.h file | annotate | diff | comparison | revisions
Models/ASBarabasiAlbertModel.cc file | annotate | diff | comparison | revisions
Models/ASBarabasiAlbertModel.h file | annotate | diff | comparison | revisions
Models/ASModel.cc file | annotate | diff | comparison | revisions
Models/ASModel.h file | annotate | diff | comparison | revisions
Models/ASWaxmanModel.cc file | annotate | diff | comparison | revisions
Models/ASWaxmanModel.h file | annotate | diff | comparison | revisions
Models/BottomUpHierModel.cc file | annotate | diff | comparison | revisions
Models/BottomUpHierModel.h file | annotate | diff | comparison | revisions
Models/ImportedFileModel.cc file | annotate | diff | comparison | revisions
Models/ImportedFileModel.h file | annotate | diff | comparison | revisions
Models/Model.cc file | annotate | diff | comparison | revisions
Models/Model.h file | annotate | diff | comparison | revisions
Models/RouterBarabasiAlbertModel.cc file | annotate | diff | comparison | revisions
Models/RouterBarabasiAlbertModel.h file | annotate | diff | comparison | revisions
Models/RouterModel.cc file | annotate | diff | comparison | revisions
Models/RouterModel.h file | annotate | diff | comparison | revisions
Models/RouterWaxmanModel.cc file | annotate | diff | comparison | revisions
Models/RouterWaxmanModel.h file | annotate | diff | comparison | revisions
Models/TopDownHierModel.cc file | annotate | diff | comparison | revisions
Models/TopDownHierModel.h file | annotate | diff | comparison | revisions
Node.cc file | annotate | diff | comparison | revisions
Node.h file | annotate | diff | comparison | revisions
Parser.cc file | annotate | diff | comparison | revisions
Parser.h file | annotate | diff | comparison | revisions
Topology.cc file | annotate | diff | comparison | revisions
Topology.h file | annotate | diff | comparison | revisions
Util.cc file | annotate | diff | comparison | revisions
Util.h file | annotate | diff | comparison | revisions 
--- a/Brite.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Brite.h	Tue Feb 22 13:17:57 2011 -0500
@@ -37,6 +37,10 @@
 #include "Models/ImportedFileModel.h"
 #include "Topology.h"
 
+namespace brite {
+
+} // namespace brite
+
 #endif /* BRITE_H */
 
 
--- a/BriteMain.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/BriteMain.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,7 @@
 #include "Brite.h"
 
 using namespace std;
+namespace brite {
 
 class BriteMain {
 
@@ -329,4 +330,4 @@
 
 }
 
-
+} // namespace brite
--- a/Edge.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Edge.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -26,6 +26,8 @@
 
 #include "Edge.h"
 
+namespace brite {
+
 int Edge::edge_count = 0;
 
 Edge::Edge(Node* s, Node* d) 
@@ -82,3 +84,5 @@
   return sqrt(foo);
 
 }
+
+} // namespace brite
--- a/Edge.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Edge.h	Tue Feb 22 13:17:57 2011 -0500
@@ -29,6 +29,8 @@
 #include "Util.h"
 #include "Node.h"
 
+namespace brite {
+
 #define SPEED_OF_LIGHT 299792458.0
 
 class Node;
@@ -134,4 +136,6 @@
   
 };
 
+} // namespace brite
+
 #endif /* EDGE_H */
--- a/Graph.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Graph.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "Graph.h"
 
 using namespace std;
+namespace brite {
 
 Graph::Graph(int n) : nodes(n), adjList(n), incList(n) {
 
@@ -139,7 +140,4 @@
 
 }
   
-
-
-
-
+} // namespace brite
--- a/Graph.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Graph.h	Tue Feb 22 13:17:57 2011 -0500
@@ -29,6 +29,8 @@
 #include "Node.h"
 #include "Edge.h"
 
+namespace brite {
+
 class Node;
 class Edge;
 
@@ -71,5 +73,6 @@
 
 };
 
+} // namespace brite
 
 #endif /* GRAPH_H */
--- a/Models/ASBarabasiAlbertModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ASBarabasiAlbertModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "ASBarabasiAlbertModel.h"
 
 using namespace std;
+namespace brite {
 
 ASBarabasiAlbert::ASBarabasiAlbert(ASBarabasiAlbertPar* par) {
 
@@ -246,4 +247,4 @@
 
 }
 
-
+} // namespace brite
--- a/Models/ASBarabasiAlbertModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ASBarabasiAlbertModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "ASModel.h"
 
+namespace brite {
+
 class ASBarabasiAlbertPar;
 
 class ASBarabasiAlbert : public ASModel {
@@ -47,7 +49,6 @@
 
 };
 
+} // namespace brite
 
 #endif /* AS_BAR_MODEL_H */
-
-
--- a/Models/ASModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ASModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "ASModel.h"
 
 using namespace std;
+namespace brite {
 
 void ASModel::AssignBW(Graph* g) {
 
@@ -204,4 +205,4 @@
   }
 }
 
-
+} // namespace brite
--- a/Models/ASModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ASModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "Model.h"
 
+namespace brite {
+
 ////////////////////////////////////////
 //
 // class ASModel
@@ -60,7 +62,6 @@
 
 };
 
+} // namespace brite
 
 #endif /* AS_MODEL_H */
-
-
--- a/Models/ASWaxmanModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ASWaxmanModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "ASWaxmanModel.h"
 
 using namespace std;
+namespace brite {
 
 string ASWaxman::ToString() {
   
@@ -356,3 +357,4 @@
   }
 }
 
+} // namespace brite
--- a/Models/ASWaxmanModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ASWaxmanModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "ASModel.h"
 
+namespace brite {
+
 //////////////////////////////////////////////
 //
 // class ASWaxman
@@ -58,6 +60,6 @@
 
 };
 
-#endif /* AS_WAX_MODEL_H */
+} // namespace brite
 
-
+#endif /* AS_WAX_MODEL_H */
--- a/Models/BottomUpHierModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/BottomUpHierModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -32,6 +32,7 @@
 #include "ImportedFileModel.h"
 
 using namespace std;
+namespace brite {
 
 BottomUpHierModel::BottomUpHierModel(BottUpPar* par) : models(2) {
 
@@ -347,3 +348,4 @@
   }
 }
 
+} // namespace brite
--- a/Models/BottomUpHierModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/BottomUpHierModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "Model.h" 
 
+namespace brite {
+
 //////////////////////////////////////////////
 //
 // class BottomUpHierModel
@@ -66,7 +68,6 @@
 
 };
 
+} // namespace brite
 
 #endif /* MODEL_H */
-
-
--- a/Models/ImportedFileModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ImportedFileModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "ImportedFileModel.h"
 
 using namespace std;
+namespace brite {
 
 ImportedFileModel::ImportedFileModel(ImportedFilePar* par) : model_strings(3) {
 
@@ -1122,3 +1123,5 @@
 
   return graph;
 }
+
+} // namespace brite
--- a/Models/ImportedFileModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/ImportedFileModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -29,6 +29,8 @@
 
 #include "Model.h"
 
+namespace brite {
+
 ////////////////////////////////////////
 //
 // class ImportedFileModel
@@ -137,6 +139,6 @@
 
 };
 
-#endif /* IF_MODEL_H */
+} // namespace brite
 
-
+#endif /* IF_MODEL_H */
--- a/Models/Model.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/Model.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "Model.h"
 
 using namespace std;
+namespace brite {
 
 unsigned short int Model::s_places[3] = {0,0,0};
 unsigned short int Model::s_connect[3] = {0,0,0};
@@ -89,5 +90,4 @@
 
 }
 
-
-
+} // namespace brite
--- a/Models/Model.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/Model.h	Tue Feb 22 13:17:57 2011 -0500
@@ -30,6 +30,8 @@
 #include "../Parser.h"
 #include <algorithm>
 
+namespace brite {
+
 enum PlacementType { P_RANDOM = 1, P_HT = 2 };
 enum GrowthType { G_INCR = 1, G_ALL = 2 };
 enum PrefType { PC_NONE = 1, PC_BARABASI = 2 };
@@ -112,6 +114,6 @@
 
 };
 
-#endif /* MODEL_H */
+} // namespace brite
 
-
+#endif /* MODEL_H */
--- a/Models/RouterBarabasiAlbertModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/RouterBarabasiAlbertModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "RouterBarabasiAlbertModel.h"
 
 using namespace std;
+namespace brite {
 
 RouterBarabasiAlbert::RouterBarabasiAlbert(RouterBarabasiAlbertPar* par)
 {
@@ -246,4 +247,4 @@
   cout << "Done interconnecting...\n" << flush;
 }
 
-
+} // namespace brite
--- a/Models/RouterBarabasiAlbertModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/RouterBarabasiAlbertModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "RouterModel.h"
 
+namespace brite {
+
 ////////////////////////////////////////////////
 //
 // class RouterBarabasiAlbert
@@ -59,7 +61,6 @@
 
 };
 
+} // namespace brite
 
 #endif /* RT_BAR_MODEL_H */
-
-
--- a/Models/RouterModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/RouterModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "RouterModel.h"
 
 using namespace std;
+namespace brite {
 
 void RouterModel::AssignBW(Graph* g) {
 
@@ -206,4 +207,4 @@
   cout << "done!\n" << flush;
 }
 
-
+} // namespace brite
--- a/Models/RouterModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/RouterModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "Model.h"
 
+namespace brite {
+
 ////////////////////////////////////////
 //
 // class RouterModel
@@ -61,6 +63,6 @@
 
 };
 
-#endif /* ROUTER_MODEL_H */
+} // namespace brite
 
-
+#endif /* ROUTER_MODEL_H */
--- a/Models/RouterWaxmanModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/RouterWaxmanModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "RouterWaxmanModel.h"
 
 using namespace std;
+namespace brite {
 
 RouterWaxman::RouterWaxman(RouterWaxPar* par)  {
   
@@ -362,4 +363,4 @@
 
 }
 
-
+} // namespace brite
--- a/Models/RouterWaxmanModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/RouterWaxmanModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "RouterModel.h"
 
+namespace brite {
+
 //////////////////////////////////////////////
 //
 // class RouterWaxman
@@ -59,6 +61,6 @@
 
 };
 
-#endif /* RT_WAX_MODEL_H */
+} // namespace brite
 
-
+#endif /* RT_WAX_MODEL_H */
--- a/Models/TopDownHierModel.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/TopDownHierModel.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -32,6 +32,7 @@
 #include "ImportedFileModel.h"
 
 using namespace std;
+namespace brite {
 
 TopDownHierModel::TopDownHierModel(TopDownPar* par) : models(2) {
 
@@ -499,3 +500,4 @@
     return n;
 }
 
+} // namespace brite
--- a/Models/TopDownHierModel.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Models/TopDownHierModel.h	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,8 @@
 
 #include "Model.h"
 
+namespace brite {
+
 //////////////////////////////////////////////////
 //
 // class TopDownHierModel
@@ -78,6 +80,6 @@
   
 };
 
-#endif /* TD_MODEL_H */
+} // namespace brite
 
-
+#endif /* TD_MODEL_H */
--- a/Node.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Node.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -26,6 +26,8 @@
 
 #include "Node.h"
 
+namespace brite {
+
 Node::Node(int i) {
 
   nodeId = i;
@@ -71,3 +73,5 @@
     }
   } 
 }
+
+} // namespace brite
--- a/Node.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Node.h	Tue Feb 22 13:17:57 2011 -0500
@@ -30,6 +30,8 @@
 #include "Graph.h"
 #include "Topology.h"
 
+namespace brite {
+
 class Topology;
 class NodeConf;
 class Graph;
@@ -136,4 +138,6 @@
 
 };
 
+} // namespace brite
+
 #endif /* NODE_H */
--- a/Parser.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Parser.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -28,6 +28,7 @@
 #include <algorithm>
 
 using namespace std;
+namespace brite {
 
 Parse::Parse(string f) : delimiters(6), output_formats(2) {
   
@@ -831,4 +832,4 @@
   
 }
 
-
+} // namespace brite
--- a/Parser.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Parser.h	Tue Feb 22 13:17:57 2011 -0500
@@ -26,6 +26,7 @@
 #define PARSER_H
 
 #include "Util.h"
+namespace brite {
 
 #define MAXLINE 10000
 #define MAXFILENAME 50
@@ -315,4 +316,6 @@
 
 };
 
+} // namespace brite
+
 #endif /* PARSER_H */
--- a/Topology.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Topology.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -37,6 +37,7 @@
 #include "Models/BottomUpHierModel.h"
 
 using namespace std;
+namespace brite {
 
 Topology::Topology(Model* model) 
 {
@@ -464,3 +465,4 @@
   }
 }
 
+} // namespace brite
--- a/Topology.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Topology.h	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,8 @@
 
 #include "Models/Model.h"
 
+namespace brite {
+
 #pragma interface
 
 class Model;
@@ -53,7 +55,6 @@
 
 };
 
-#endif /* TOPOLOGY_H */
+} // namespace brite
 
-
-
+#endif /* TOPOLOGY_H */
--- a/Util.cc	Wed Nov 10 16:20:48 2010 -0500
+++ b/Util.cc	Tue Feb 22 13:17:57 2011 -0500
@@ -27,6 +27,7 @@
 #include "Util.h"
 
 using namespace std;
+namespace brite {
 
 RandomVariable::RandomVariable(unsigned short int *s) {
 
@@ -112,9 +113,4 @@
 
 }
 
-
-
-
-
- 
-
+} // namespace brite
--- a/Util.h	Wed Nov 10 16:20:48 2010 -0500
+++ b/Util.h	Tue Feb 22 13:17:57 2011 -0500
@@ -36,6 +36,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+namespace brite {
+
 #define MAXNUM 0x3FFFFFFF
 #define	MAXINT	2147483647
 
@@ -106,6 +108,6 @@
 
 int BinarySearch(std::vector<double>&, int, int, double);
 
+} // namespace brite
 
 #endif /* UTIL_H */
-
jpelkey3/BRITE