Revert "Merge pull request #29 from cgroer/master"

This reverts commit fa8dce2, reversing changes made to 625e5fe.
bdsullivan · Aug 26, 2013 · 42b0986 · 42b0986
1 parent fa8dce2
commit 42b0986
Show file tree

Hide file tree

Showing 30 changed files with 1,058 additions and 387 deletions.
diff --git a/MSVC/INDDGO.sln b/MSVC/INDDGO.sln
@@ -11,10 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "serial_wis", "serial_wis\se
 		{E88CD5F0-B70E-4504-B83B-393FC3FC12BD} = {E88CD5F0-B70E-4504-B83B-393FC3FC12BD}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "complement", "complement\complement.vcxproj", "{5C254779-B077-4F58-8105-FC27A27074F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen_pkt", "gen_pkt\gen_pkt.vcxproj", "{7445D331-FCBB-4477-B3F4-576B3A435505}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -33,14 +29,6 @@ Global
 		{F0033BB8-C99B-4696-9350-F6B97850C220}.Debug|Win32.Build.0 = Debug|Win32
 		{F0033BB8-C99B-4696-9350-F6B97850C220}.Release|Win32.ActiveCfg = Release|Win32
 		{F0033BB8-C99B-4696-9350-F6B97850C220}.Release|Win32.Build.0 = Release|Win32
-		{5C254779-B077-4F58-8105-FC27A27074F6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5C254779-B077-4F58-8105-FC27A27074F6}.Debug|Win32.Build.0 = Debug|Win32
-		{5C254779-B077-4F58-8105-FC27A27074F6}.Release|Win32.ActiveCfg = Release|Win32
-		{5C254779-B077-4F58-8105-FC27A27074F6}.Release|Win32.Build.0 = Release|Win32
-		{7445D331-FCBB-4477-B3F4-576B3A435505}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7445D331-FCBB-4477-B3F4-576B3A435505}.Debug|Win32.Build.0 = Debug|Win32
-		{7445D331-FCBB-4477-B3F4-576B3A435505}.Release|Win32.ActiveCfg = Release|Win32
-		{7445D331-FCBB-4477-B3F4-576B3A435505}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MSVC/INDDGO.suo b/MSVC/INDDGO.suo
diff --git a/MSVC/complement/complement.vcxproj b/MSVC/complement/complement.vcxproj
diff --git a/MSVC/complement/complement.vcxproj.filters b/MSVC/complement/complement.vcxproj.filters
diff --git a/MSVC/gen_pkt/gen_pkt.vcxproj b/MSVC/gen_pkt/gen_pkt.vcxproj
diff --git a/MSVC/gen_pkt/gen_pkt.vcxproj.filters b/MSVC/gen_pkt/gen_pkt.vcxproj.filters
diff --git a/MSVC/lib_graphd/lib_graphd.vcxproj b/MSVC/lib_graphd/lib_graphd.vcxproj
@@ -11,21 +11,31 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\lib_graphd\src\AdjMatrixGraphReader.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\AdjMatrixGraphWriter.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\Debug.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\DIMACSGraphReader.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\DIMACSGraphWriter.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\Graph.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphCreator.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphCreatorFile.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphDisplay.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphEOUtil.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphProperties.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphReader.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\GraphReaderWriterFactory.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphUtil.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\GraphVizGraphWriter.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\GraphWriter.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\Log.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\MetisGraphReader.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\MetisGraphWriter.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\MutableGraph.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\Node.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\RndNumGen.cpp" />
     <ClCompile Include="..\..\lib_graphd\src\Util.cpp" />
-    <ClCompile Include="..\..\lib_graphd\src\VertexWeightedGraph.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\WeightedGraph.cpp" />
+    <ClCompile Include="..\..\lib_graphd\src\WeightedMutableGraph.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BFE092BE-DF45-44F1-B013-A98820441A40}</ProjectGuid>

diff --git a/MSVC/lib_graphd/lib_graphd.vcxproj.filters b/MSVC/lib_graphd/lib_graphd.vcxproj.filters
@@ -15,9 +15,21 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\lib_graphd\src\AdjMatrixGraphReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\AdjMatrixGraphWriter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\lib_graphd\src\Debug.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\DIMACSGraphReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\DIMACSGraphWriter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\lib_graphd\src\Graph.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -39,15 +51,30 @@
     <ClCompile Include="..\..\lib_graphd\src\GraphReader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\GraphReaderWriterFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\lib_graphd\src\GraphUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\GraphVizGraphWriter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\lib_graphd\src\GraphWriter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\lib_graphd\src\Log.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\MetisGraphReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\MetisGraphWriter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\MutableGraph.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\lib_graphd\src\Node.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -57,7 +84,10 @@
     <ClCompile Include="..\..\lib_graphd\src\Util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lib_graphd\src\VertexWeightedGraph.cpp">
+    <ClCompile Include="..\..\lib_graphd\src\WeightedGraph.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\lib_graphd\src\WeightedMutableGraph.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/lib_graphd/inc/Graph.h b/lib_graphd/inc/Graph.h
@@ -25,8 +25,10 @@
 #ifdef _OPENMP
   #include <omp.h>
 #else
-  #define omp_get_num_threads() 0
-  #define omp_get_thread_num() 0
+    #ifndef HAS_METIS
+      #define omp_get_num_threads() 1
+      #define omp_get_thread_num() 0
+    #endif
 #endif
 
 #include "GraphInterface.h"

diff --git a/lib_graphd/inc/GraphCreator.h b/lib_graphd/inc/GraphCreator.h
@@ -33,6 +33,9 @@ namespace Graph {
 public:
     virtual VertexWeightedGraph *create_random_edge_subgraph(VertexWeightedGraph *wmg, int percent_edges);
     virtual VertexWeightedGraph *initialize_ktree(int n, int tw);
+    virtual Graph *initialize_rig(int n, int seed, list<double> *probs);
+    virtual Graph *initialize_rmat(int l, int m, double *probs, int seed, bool self_loop);
+
     // Creates the induced subgraph on the given list of vertices (by position in adj_list).
     // Does not check connectedness. Caller must allocate space for the graph G.
     virtual VertexWeightedGraph *create_induced_subgraph(VertexWeightedGraph *wmg, list<int> *members, bool make_simple);

diff --git a/lib_graphd/inc/GraphReader.h b/lib_graphd/inc/GraphReader.h
@@ -28,9 +28,7 @@
 #include "Log.h"
 #include "Debug.h"
 #include <stdio.h>
-#if !WIN32 && !WIN64
 #include <strings.h>
-#endif
 #include <stdlib.h>
 #include <iostream>
 #include <algorithm>

diff --git a/lib_graphd/inc/GraphWriter.h b/lib_graphd/inc/GraphWriter.h
@@ -28,9 +28,7 @@
 #include "Log.h"
 #include "Debug.h"
 #include <stdio.h>
-#if !WIN32 && !WIN64
 #include <strings.h>
-#endif
 #include <stdlib.h>
 #include <iostream>
 #include <algorithm>