Skip to content
Snippets Groups Projects
Commit 43912a77 authored by Paul Nitzke's avatar Paul Nitzke
Browse files

Change all strings to Strings

* Better consistency
* string is just an alias for String
* As Strings are objects it makes sense to refer to them with according
  notation
parent 983d0310
Branches
No related tags found
1 merge request!32Change all strings to Strings
......@@ -5,7 +5,7 @@ using CLIOptions;
public class Program
{
public static void Main(string[] args)
public static void Main(String[] args)
{
Parser.Default.ParseArguments<ConvertOptions, PartitionOptions>(args)
.WithParsed<ConvertOptions>(o =>
......
......@@ -10,7 +10,7 @@
// [Test]
// public void Convert2DotTest()
// {
// string fileName = @"..\Resources\fileName.txt";
// String fileName = @"..\Resources\fileName.txt";
// String MMMatrix = File.ReadAllText(fileName);
// String result = ConversionManager.Convert2Dot(MMMatrix);
// String expectedResult = " ";
......@@ -20,7 +20,7 @@
// [Test]
// public void Partition2ColoredDotTest()
// {
// string fileName = @"..\Resources\fileName.txt";
// String fileName = @"..\Resources\fileName.txt";
// String MMMatrix = File.ReadAllText(fileName);
// String result = ConversionManager.Partition2ColoredDot(MMMatrix);
// String expectedResult = " ";
......@@ -30,7 +30,7 @@
// [Test]
// public void Partition2SeedMatrixTest()
// {
// string fileName = @"..\Resources\fileName.txt";
// String fileName = @"..\Resources\fileName.txt";
// String MMMatrix = File.ReadAllText(fileName);
// String result = ConversionManager.Partition2SeedMatrix(MMMatrix);
// String expectedResult = " ";
......@@ -40,7 +40,7 @@
// [Test]
// public void Partition2CompressedMatrixTest()
// {
// string fileName = @"..\Resources\fileName.txt";
// String fileName = @"..\Resources\fileName.txt";
// String MMMatrix = File.ReadAllText(fileName);
// String result = ConversionManager.Partition2CompressedMatrix(MMMatrix);
// String expectedResult = " ";
......
......@@ -34,8 +34,8 @@ namespace SparseTransform.Tests.Library.Convert
graph.AddEdge(5, 4);
graph.AddEdge(5, 5);
string[] lines = writer.Write(graph).Split(
new string[] { "\r\n", "\r", "\n" },
String[] lines = writer.Write(graph).Split(
new String[] { "\r\n", "\r", "\n" },
StringSplitOptions.None
);
......@@ -61,8 +61,8 @@ namespace SparseTransform.Tests.Library.Convert
graph.AddEdge(4, 1);
graph.AddEdge(5, 4);
string[] lines = writer.Write(graph).Split(
new string[] { "\r\n", "\r", "\n" },
String[] lines = writer.Write(graph).Split(
new String[] { "\r\n", "\r", "\n" },
StringSplitOptions.None
);
......
......@@ -53,8 +53,8 @@ namespace SparseTransform.Tests.Library.Convert
DoubleMatrix inputMatrix = reader.ReadMatrix(bipartiteGraph);
MatrixMarketWriter writer = new MatrixMarketWriter(false, inputMatrix);
string[] lines = writer.Write(graph).Split(
new string[] { "\r\n", "\r", "\n" },
String[] lines = writer.Write(graph).Split(
new String[] { "\r\n", "\r", "\n" },
StringSplitOptions.None
);
......@@ -75,8 +75,8 @@ namespace SparseTransform.Tests.Library.Convert
DoubleMatrix inputMatrix = reader.ReadMatrix(adjacencyGraph);
MatrixMarketWriter writer = new MatrixMarketWriter(false, inputMatrix);
string[] lines = writer.Write(graph).Split(
new string[] { "\r\n", "\r", "\n" },
String[] lines = writer.Write(graph).Split(
new String[] { "\r\n", "\r", "\n" },
StringSplitOptions.None
);
......
......@@ -13,7 +13,7 @@ namespace SparseTransform.Convert
/// </summary>
/// <param name="graph">IGraph implementation to transform</param>
/// <returns>DOT string</returns>
public string Write(IGraph graph)
public String Write(IGraph graph)
{
StringBuilder output = new StringBuilder();
......
......@@ -15,7 +15,7 @@ namespace Transform.Convert
/// <param name="msg">thrown error message</param>
/// <param name="e"></param>
/// <exception cref="Exception"></exception>
public void SyntaxError([NotNull] IRecognizer recognizer, [Nullable] IToken offendingSymbol, int line, int charPositionInLine, [NotNull] string msg, [Nullable] RecognitionException e)
public void SyntaxError([NotNull] IRecognizer recognizer, [Nullable] IToken offendingSymbol, int line, int charPositionInLine, [NotNull] String msg, [Nullable] RecognitionException e)
{
throw new Exception("Error in MatrixMarket header line: " + msg);
}
......
......@@ -9,10 +9,10 @@ namespace SparseTransform.Convert
/// </summary>
public class MatrixMarketReader : IReader
{
public IGraph ReadGraph(string matrix)
public IGraph ReadGraph(String matrix)
{
string[] lines = matrix.Split(
new string[] { "\r\n", "\r", "\n" },
String[] lines = matrix.Split(
new String[] { "\r\n", "\r", "\n" },
StringSplitOptions.None
);
......@@ -36,10 +36,10 @@ namespace SparseTransform.Convert
}
}
public DoubleMatrix ReadMatrix(string matrix)
public DoubleMatrix ReadMatrix(String matrix)
{
string[] lines = matrix.Split(
new string[] { "\r\n", "\r", "\n" },
String[] lines = matrix.Split(
new String[] { "\r\n", "\r", "\n" },
StringSplitOptions.None
);
......@@ -60,7 +60,7 @@ namespace SparseTransform.Convert
/// </summary>
/// <param name="header">header of the MMF-input</param>
/// <returns>true if matrix is not symmetric</returns>
private bool checkHeader(string header)
private bool checkHeader(String header)
{
AntlrInputStream stream = new AntlrInputStream(header);
MMFHeaderLexer lexer = new MMFHeaderLexer(stream);
......@@ -77,10 +77,10 @@ namespace SparseTransform.Convert
/// </summary>
/// <param name="lines">entire input split by newlines</param>
/// <exception cref="FormatException"></exception>
private void checkComments(string[] lines)
private void checkComments(String[] lines)
{
bool leftComments = false;
foreach (string line in lines)
foreach (String line in lines)
{
if (line != "")
{
......@@ -110,9 +110,9 @@ namespace SparseTransform.Convert
/// <param name="graph"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public void ReadContent(string[] matrix, Action<int, int, double> processor)
public void ReadContent(String[] matrix, Action<int, int, double> processor)
{
string[] values;
String[] values;
int lineCount = getFirstDataLine(matrix);
matrix[lineCount] = "% " + matrix[lineCount];
foreach (String line in matrix)
......@@ -143,7 +143,7 @@ namespace SparseTransform.Convert
private int getFirstDataLine(String[] lines)
{
int firstDataLine = 0;
foreach (string line in lines)
foreach (String line in lines)
{
if (line != "")
{
......
......@@ -36,7 +36,7 @@ namespace SparseTransform.Convert
/// </summary>
/// <param name="graph">IGraph implementation to transform</param>
/// <returns>MatrixMarket string</returns>
public string Write(IGraph graph)
public String Write(IGraph graph)
{
IntegerMatrix? seedMatrix = graph.ToSeedMatrix(_inputMatrix.RowCount);
if (_seed)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment