Skip to content

Commit 0416692

Browse files
gsvgitgsvgit
authored
Merge pull request #193 from jnyrup/FloatingPoint
Use InvariantCulture when formatting floating points
2 parents ddedfbc + 20bc40a commit 0416692

File tree

5 files changed

+153
-0
lines changed

5 files changed

+153
-0
lines changed

‎src/QuickGraph.Graphviz/Dot/GraphvizEdge.cs

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace QuickGraph.Graphviz.Dot
33
using System;
44
using System.Collections;
55
using System.Drawing;
6+
using System.Globalization;
67
using System.IO;
78

89
public class GraphvizEdge
@@ -46,6 +47,18 @@ internal string GenerateDot(Hashtable pairs)
4647
writer.Write("{0}=\"{1}\"", entry.Key.ToString(), entry.Value.ToString());
4748
continue;
4849
}
50+
if (entry.Value is float)
51+
{
52+
float floatValue = (float)entry.Value;
53+
writer.Write("{0}={1}", entry.Key.ToString(), floatValue.ToString(CultureInfo.InvariantCulture));
54+
continue;
55+
}
56+
if (entry.Value is double)
57+
{
58+
double doubleValue = (double)entry.Value;
59+
writer.Write("{0}={1}", entry.Key.ToString(), doubleValue.ToString(CultureInfo.InvariantCulture));
60+
continue;
61+
}
4962
if (entry.Value is GraphvizEdgeDirection)
5063
{
5164
writer.Write("{0}={1}", entry.Key.ToString(), ((GraphvizEdgeDirection) entry.Value).ToString().ToLower());

‎src/QuickGraph.Graphviz/Dot/GraphvizGraph.cs

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace QuickGraph.Graphviz.Dot
44
using System.Collections;
55
using System.Collections.Generic;
66
using System.Drawing;
7+
using System.Globalization;
78
using System.IO;
89

910
public class GraphvizGraph
@@ -53,6 +54,18 @@ internal string GenerateDot(Hashtable pairs)
5354
entries.Add(String.Format("{0}=\"{1}\"", entry.Key.ToString(), entry.Value.ToString()));
5455
continue;
5556
}
57+
if (entry.Value is float)
58+
{
59+
float floatValue = (float)entry.Value;
60+
entries.Add(String.Format("{0}={1}", entry.Key.ToString(), floatValue.ToString(CultureInfo.InvariantCulture)));
61+
continue;
62+
}
63+
if (entry.Value is double)
64+
{
65+
double doubleValue = (double)entry.Value;
66+
entries.Add(String.Format("{0}={1}", entry.Key.ToString(), doubleValue.ToString(CultureInfo.InvariantCulture)));
67+
continue;
68+
}
5669
if (entry.Value is Color)
5770
{
5871
Color color = (Color) entry.Value;

‎src/QuickGraph.Graphviz/Dot/GraphvizVertex.cs

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace QuickGraph.Graphviz.Dot
55
using System.Drawing;
66
using System.IO;
77
using System.Collections.Generic;
8+
using System.Globalization;
89

910
public class GraphvizVertex
1011
{
@@ -53,6 +54,18 @@ internal string GenerateDot(Dictionary<string, object> pairs)
5354
writer.Write("{0}=\"{1}\"", entry.Key, entry.Value.ToString());
5455
continue;
5556
}
57+
if (entry.Value is float)
58+
{
59+
float floatValue = (float)entry.Value;
60+
writer.Write("{0}={1}", entry.Key, floatValue.ToString(CultureInfo.InvariantCulture));
61+
continue;
62+
}
63+
if (entry.Value is double)
64+
{
65+
double doubleValue = (double)entry.Value;
66+
writer.Write("{0}={1}", entry.Key, doubleValue.ToString(CultureInfo.InvariantCulture));
67+
continue;
68+
}
5669
if (entry.Value is GraphvizVertexShape)
5770
{
5871
writer.Write("{0}={1}", entry.Key, ((GraphvizVertexShape) entry.Value).ToString().ToLower());

‎tests/QuickGraph.Tests/GraphVizTests.cs

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
using QuickGraph.Graphviz;
3+
using System.Drawing;
4+
using System.Globalization;
5+
using System.Threading;
6+
7+
namespace QuickGraph.Tests
8+
{
9+
[TestClass]
10+
public class GraphVizTests
11+
{
12+
private static CultureInfo oldCulture;
13+
14+
[ClassInitialize]
15+
public static void ClassInitialize(TestContext context)
16+
{
17+
oldCulture = Thread.CurrentThread.CurrentCulture;
18+
19+
// Germany (de-DE) uses comma as decimal separator
20+
Thread.CurrentThread.CurrentCulture = new CultureInfo("de-DE");
21+
}
22+
23+
[ClassCleanup]
24+
public static void ClassCleanup()
25+
{
26+
Thread.CurrentThread.CurrentCulture = oldCulture;
27+
}
28+
29+
[TestMethod]
30+
public void CommonVertexFormat_FontSize_UseDecimalPointForFloats()
31+
{
32+
var graph = new AdjacencyGraph<string, IEdge<string>>(false);
33+
graph.AddVerticesAndEdge(new Edge<string>("s", "t"));
34+
35+
var gv = new GraphvizAlgorithm<string, IEdge<string>>(graph);
36+
gv.CommonVertexFormat.Font = new Font(SystemFonts.DefaultFont.FontFamily, emSize: 1.75f);
37+
38+
var res = gv.Generate();
39+
40+
StringAssert.Contains(res, "fontsize=1.75", "Formatting floating points should always use dot as decimal separator");
41+
}
42+
43+
[TestMethod]
44+
public void CommonVertexFormat_Z_UseDecimalPointForDoubles()
45+
{
46+
var graph = new AdjacencyGraph<string, IEdge<string>>(false);
47+
graph.AddVerticesAndEdge(new Edge<string>("s", "t"));
48+
49+
var gv = new GraphvizAlgorithm<string, IEdge<string>>(graph);
50+
gv.CommonVertexFormat.Z = 1.75;
51+
52+
var res = gv.Generate();
53+
54+
StringAssert.Contains(res, "z=1.75", "Formatting floating points should always use dot as decimal separator");
55+
}
56+
57+
[TestMethod]
58+
public void CommonEdgeFormat_FontSize_UseDecimalPointForFloats()
59+
{
60+
var graph = new AdjacencyGraph<string, IEdge<string>>(false);
61+
graph.AddVerticesAndEdge(new Edge<string>("s", "t"));
62+
63+
var gv = new GraphvizAlgorithm<string, IEdge<string>>(graph);
64+
gv.CommonEdgeFormat.Font = new Font(SystemFonts.DefaultFont.FontFamily, emSize: 1.75f);
65+
66+
var res = gv.Generate();
67+
68+
StringAssert.Contains(res, "fontsize=1.75", "Formatting floating points should always use dot as decimal separator");
69+
}
70+
71+
[TestMethod]
72+
public void CommonEdgeFormat_Weight_UseDecimalPointForDoubles()
73+
{
74+
var graph = new AdjacencyGraph<string, IEdge<string>>(false);
75+
graph.AddVerticesAndEdge(new Edge<string>("s", "t"));
76+
77+
var gv = new GraphvizAlgorithm<string, IEdge<string>>(graph);
78+
gv.CommonEdgeFormat.Weight = 1.75;
79+
80+
var res = gv.Generate();
81+
82+
StringAssert.Contains(res, "weight=1.75", "Formatting floating points should always use dot as decimal separator");
83+
}
84+
85+
[TestMethod]
86+
public void GraphFormat_RankSeparation_UseDecimalPointForDoubles()
87+
{
88+
var graph = new AdjacencyGraph<string, IEdge<string>>(false);
89+
graph.AddVerticesAndEdge(new Edge<string>("s", "t"));
90+
91+
var gv = new GraphvizAlgorithm<string, IEdge<string>>(graph);
92+
gv.GraphFormat.RankSeparation = 0.75d;
93+
94+
var res = gv.Generate();
95+
96+
StringAssert.Contains(res, "ranksep=0.75", "Formatting floating points should always use dot as decimal separator");
97+
}
98+
99+
[TestMethod]
100+
public void GraphFormat_FontSize_UseDecimalPointForFloats()
101+
{
102+
var graph = new AdjacencyGraph<string, IEdge<string>>(false);
103+
graph.AddVerticesAndEdge(new Edge<string>("s", "t"));
104+
105+
var gv = new GraphvizAlgorithm<string, IEdge<string>>(graph);
106+
gv.GraphFormat.Font = new Font(SystemFonts.DefaultFont.FontFamily, emSize: 1.75f);
107+
108+
var res = gv.Generate();
109+
110+
StringAssert.Contains(res, "fontsize=1.75", "Formatting floating points should always use dot as decimal separator");
111+
}
112+
}
113+
}

‎tests/QuickGraph.Tests/QuickGraph.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@
478478
<Compile Include="GraphExtensionsTest.ToAdjacencyGraph04.g.cs">
479479
<DependentUpon>GraphExtensionsTest.cs</DependentUpon>
480480
</Compile>
481+
<Compile Include="GraphVizTests.cs" />
481482
<Compile Include="MutableVertexAndEdgeListGraphTest.cs" />
482483
<Compile Include="Properties\PexAssemblyInfo.cs" />
483484
<Compile Include="Properties\AssemblyInfo.cs" />

0 commit comments

Comments
 (0)