Added gvmap to Windows

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index dfdd266baf9113bf1adeb62cfbe0340dec46d3fc..9f6bcb1f90091c930eec03467a71870b340c6038 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -44,6 +44,37 @@ enum {POINTS_ALL = 1, POINTS_LABEL, POINTS_RANDOM};
 enum {maxlen = 10000000};
 enum {MAX_GRPS = 10000};
 static char swork[maxlen];
+static float test=(float)0.35345345353535345534534545;
+
+#ifdef WIN32
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "sparse.lib" )
+    #pragma comment( lib, "neatogen.lib" )
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "pathplan.lib" )
+    #pragma comment( lib, "neatogen.lib" )
+    #pragma comment( lib, "circogen.lib" )
+    #pragma comment( lib, "twopigen.lib" )
+    #pragma comment( lib, "fdpgen.lib" )
+    #pragma comment( lib, "sparse.lib" )
+    #pragma comment( lib, "cdt.lib" )
+    #pragma comment( lib, "gts.lib" )
+    #pragma comment( lib, "glib-2.0.lib" )
+    #pragma comment( lib, "vpsc.lib" )
+    #pragma comment( lib, "patchwork.lib" )
+    #pragma comment( lib, "gvortho.lib" )
+    #pragma comment( lib, "sfdp.lib" )
+    #pragma comment( lib, "rbtree.lib" )
+
+
+#else   /* not WIN32_DLL */
+#include "globals.h"
+#endif
+
+
+
 #if 0
 void *gmalloc(size_t nbytes)
 {
@@ -644,6 +675,7 @@ makeMap (SparseMatrix graph, int n, real* x, real* width, int* grouping,
 
 static void mapFromGraph (Agraph_t* g, params_t* pm)
 {
+    SparseMatrix graph;
   int n;
   real* width = NULL;
   real* x;
@@ -655,7 +687,7 @@ static void mapFromGraph (Agraph_t* g, params_t* pm)
   float* fsz;
 
   initDotIO(g);
-  SparseMatrix graph = Import_coord_clusters_from_dot(g, pm->maxcluster, pm->dim, &n, &width, NULL, &x, &grouping, 
+  graph = Import_coord_clusters_from_dot(g, pm->maxcluster, pm->dim, &n, &width, NULL, &x, &grouping, 
                                           &rgb_r,  &rgb_g,  &rgb_b,  &fsz, &labels, pm->color_scheme, CLUSTERING_MODULARITY);
   makeMap (graph, n, x, width, grouping, labels, fsz, rgb_r, rgb_g, rgb_b, pm, g);
 }

diff --git a/cmd/gvmap/gvmap.sln b/cmd/gvmap/gvmap.sln
new file mode 100644 (file)
index 0000000..0e4520c
--- /dev/null
+++ b/cmd/gvmap/gvmap.sln
@@ -0,0 +1,20 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual Studio 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvmap", "gvmap.vcproj", "{10015250-7CFF-45BE-90F3-13648727C0A0}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Debug|Win32.Build.0 = Debug|Win32\r
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Release|Win32.ActiveCfg = Release|Win32\r
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Release|Win32.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/cmd/gvmap/gvmap.vcproj b/cmd/gvmap/gvmap.vcproj
new file mode 100644 (file)
index 0000000..158a1c4
--- /dev/null
+++ b/cmd/gvmap/gvmap.vcproj
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="gvmap"\r
+       ProjectGUID="{10015250-7CFF-45BE-90F3-13648727C0A0}"\r
+       RootNamespace="gvmap"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../lib/ingraphs;../../lib/neatogen;../../lib/common;../../lib/cdt;../../lib/cgraph;../../lib/sparse;../../lib/sfdpgen;../../"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\graphviz-ms\bin;C:\gtk\lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="../../lib/ingraphs;../../lib/neatogen;../../lib/common;../../lib/cdt;../../lib/cgraph;../../lib/sparse;../../lib/sfdpgen;../../"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\graphviz-ms\bin;C:\gtk\lib"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\clustering.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\colorutil.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\country_graph_coloring.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DotIO.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gvmap.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\make_map.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mq.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\power.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/cmd/gvmap/gvmap.vcproj.RESEARCH.arif.user b/cmd/gvmap/gvmap.vcproj.RESEARCH.arif.user
new file mode 100644 (file)
index 0000000..eb8564a
--- /dev/null
+++ b/cmd/gvmap/gvmap.vcproj.RESEARCH.arif.user
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioUserFile\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       ShowAllFiles="true"\r
+       >\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="ARIF-PC"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       >\r
+                       <DebugSettings\r
+                               Command="$(TargetPath)"\r
+                               WorkingDirectory=""\r
+                               CommandArguments=""\r
+                               Attach="false"\r
+                               DebuggerType="3"\r
+                               Remote="1"\r
+                               RemoteMachine="ARIF-PC"\r
+                               RemoteCommand=""\r
+                               HttpUrl=""\r
+                               PDBPath=""\r
+                               SQLDebugging=""\r
+                               Environment=""\r
+                               EnvironmentMerge="true"\r
+                               DebuggerFlavor=""\r
+                               MPIRunCommand=""\r
+                               MPIRunArguments=""\r
+                               MPIRunWorkingDirectory=""\r
+                               ApplicationCommand=""\r
+                               ApplicationArguments=""\r
+                               ShimCommand=""\r
+                               MPIAcceptMode=""\r
+                               MPIAcceptFilter=""\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+</VisualStudioUserFile>\r

diff --git a/cmd/gvmap/gvmap.vcproj.user b/cmd/gvmap/gvmap.vcproj.user
new file mode 100644 (file)
index 0000000..0ce2ced
--- /dev/null
+++ b/cmd/gvmap/gvmap.vcproj.user
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><VisualStudioUserFile ProjectType="Visual C++" Version="9.00" ShowAllFiles="true"></VisualStudioUserFile>
\ No newline at end of file

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index c13835bc30b9c757628548445a03044ebfe9139a..4acca2658e064eb0fd5983e660704af81c75fbc1 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -2124,7 +2124,7 @@ int make_map_from_rectangle_groups(int exclude_random, int include_OK_points,
 
      
   */
-
+    real dist, avgdist;
   real *X;
   int N, nmax, i, j, k, igrp;
   int *groups, K = *nart;/* average number of points added per side of rectangle */
@@ -2271,7 +2271,7 @@ int make_map_from_rectangle_groups(int exclude_random, int include_OK_points,
 
       graph = SparseMatrix_symmetrize(graph, TRUE);
       ia = graph->ia; ja = graph->ja;
-      real dist, avgdist = 0.;
+      dist=avgdist = 0.;
       for (i = 0; i < n; i++){
        for (j = ia[i]; j < ia[i+1]; j++){
          jj = ja[j];

diff --git a/graphviz.sln b/graphviz.sln
index 206f73292d6e7c4cea65863093390bb2961747ab..f5d7484f37a57347785462df15c7804152f1cc4e 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -273,6 +273,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvortho", "lib\ortho\gvorth
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gml2gv", "cmd\tools\gml2gv.vcproj", "{2C551E96-B2EE-48B2-84BF-F6494AF7C004}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvmap", "cmd\gvmap\gvmap.vcproj", "{10015250-7CFF-45BE-90F3-13648727C0A0}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -527,6 +529,10 @@ Global
                {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Debug|Win32.Build.0 = Debug|Win32
                {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Release|Win32.ActiveCfg = Release|Win32
                {2C551E96-B2EE-48B2-84BF-F6494AF7C004}.Release|Win32.Build.0 = Release|Win32
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Debug|Win32.Build.0 = Debug|Win32
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Release|Win32.ActiveCfg = Release|Win32
+               {10015250-7CFF-45BE-90F3-13648727C0A0}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE