From 61bee0385608b4505c0a5018beef9700bd65385a Mon Sep 17 00:00:00 2001
From: Paul Nitzke <14367-paulenit@users.noreply.git.rwth-aachen.de>
Date: Sun, 19 Jun 2022 17:47:20 +0200
Subject: [PATCH] Fix: Various using directives and typos
---
.../CLIOptions/ConvertOptions.cs | 9 ++-
.../CLIOptions/PartitionOptions.cs | 17 ++--
src/SparseTransform.CLI/Program.cs | 77 ++++++++++---------
3 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/src/SparseTransform.CLI/CLIOptions/ConvertOptions.cs b/src/SparseTransform.CLI/CLIOptions/ConvertOptions.cs
index 6ba4596..024ed88 100644
--- a/src/SparseTransform.CLI/CLIOptions/ConvertOptions.cs
+++ b/src/SparseTransform.CLI/CLIOptions/ConvertOptions.cs
@@ -1,13 +1,14 @@
using System;
+using CommandLine;
namespace CLIOptions;
[Verb("convert", HelpText = "Convert MatrixMarket String to Dot String")]
public class ConvertOptions
{
- [Option("input"]
- public string Input{ get; set; }
+ [Option("input")]
+ public String Input{ get; set; }
- [Option("output"]
- public string Output{ get; set; }
+ [Option("output")]
+ public String Output{ get; set; }
}
\ No newline at end of file
diff --git a/src/SparseTransform.CLI/CLIOptions/PartitionOptions.cs b/src/SparseTransform.CLI/CLIOptions/PartitionOptions.cs
index 216845e..dc69aec 100644
--- a/src/SparseTransform.CLI/CLIOptions/PartitionOptions.cs
+++ b/src/SparseTransform.CLI/CLIOptions/PartitionOptions.cs
@@ -1,18 +1,19 @@
using System;
+using CommandLine;
namespace CLIOptions;
[Verb("Partition", HelpText = "Partitions MatrixMarket String")]
public class PartitionOptions
{
- [Option("input"]
- public string Input { get; set; }
+ [Option("input")]
+ public String Input { get; set; }
- [Option("output"]
- public string Output { get; set; }
+ [Option("output")]
+ public String Output { get; set; }
- [Option("format"]
- public string Format { get; set; }
+ [Option("format")]
+ public String Format { get; set; }
- [Option("textColor"]
- public string TextColor { get; set; }
+ [Option("textColor")]
+ public bool TextColor { get; set; }
}
\ No newline at end of file
diff --git a/src/SparseTransform.CLI/Program.cs b/src/SparseTransform.CLI/Program.cs
index 74cc3f2..c1cc5ff 100644
--- a/src/SparseTransform.CLI/Program.cs
+++ b/src/SparseTransform.CLI/Program.cs
@@ -1,49 +1,50 @@
using CommandLine;
using System;
using SparseTransform;
+using CLIOptions;
public class Program
{
public void Main(string[] args)
{
- Parser.Default.ParseArguments<ConvertOptions,PartitionOptions>(args)
- .WithParsed<ConvertOptions>(o =>
- {
-
- String MMMatrix = File.ReadAllText(o.Input);
- String DotString = Convert2Dot(MMMatrix);
- File.WriteAllText(o.Output, DotString);
-
- })
- .WithParsed<PartitionOptions>(o =>
- {
- String MMMatrix = File.ReadAllText(o.Input);
- String Output ;
+ Parser.Default.ParseArguments<ConvertOptions, PartitionOptions>(args)
+ .WithParsed<ConvertOptions>(o =>
+ {
- switch (o.Format)
- {
- case Formats.ColoredDot :
- {
- Output = Partition2ColoredDot(MMMatrix,o.TextColor);
- break;
- }
- case Formats.SeedMatrix:
- {
- Output = Partition2SeedMatrix(MMMatrix);
- break;
- }
- case Formats.CompressedMatrix:
- {
- Output = Partition2CompressedMatrix(MMMatrix);
- break;
- }
+ String MMMatrix = File.ReadAllText(o.Input);
+ String DotString = Convert2Dot(MMMatrix);
+ File.WriteAllText(o.Output, DotString);
+ })
+ .WithParsed<PartitionOptions>(o =>
+ {
+ String MMMatrix = File.ReadAllText(o.Input);
+ String Output = "";
- }
- File.WriteAllText(o.Output, Output);
-
- })
+ switch (o.Format)
+ {
+ case Formats.ColoredDot:
+ {
+ Output = Partition2ColoredDot(MMMatrix, o.TextColor);
+ break;
+ }
+ case Formats.SeedMatrix:
+ {
+ Output = Partition2SeedMatrix(MMMatrix);
+ break;
+ }
+ case Formats.CompressedMatrix:
+ {
+ Output = Partition2CompressedMatrix(MMMatrix);
+ break;
+ }
+
+
+ }
+ File.WriteAllText(o.Output, Output);
+
+ });
}
/// <summary>
/// Reference to the Convert2Dot method from ConversionManager
@@ -52,7 +53,7 @@ public class Program
/// <returns>Dot String</returns>
private String Convert2Dot(String MMMatrix)
{
- return ConversionManager.Convert2Dot(String MMMatrix);
+ return ConversionManager.Convert2Dot(MMMatrix);
}
/// <summary>
/// Reference to the Partition2ColoredDot method from ConversionManager
@@ -62,7 +63,7 @@ public class Program
/// <returns>Dot String with coloring information</returns>
private String Partition2ColoredDot(String MMMatrix, bool textColor = false)
{
- return ConversionManager.Partition2ColoredDot(String MMMatrix);
+ return ConversionManager.Partition2ColoredDot(MMMatrix);
}
@@ -73,7 +74,7 @@ public class Program
/// <returns>String of SeedMatrix</returns>
private String Partition2SeedMatrix(String MMMatrix)
{
- return ConversionManager.Partition2SeedMatrix(String MMMatrix);
+ return ConversionManager.Partition2SeedMatrix(MMMatrix);
}
@@ -84,6 +85,6 @@ public class Program
/// <returns>String of CompressedMatrix</returns>
private String Partition2CompressedMatrix(String MMMatrix)
{
- return ConversionManager.Partition2CompressedMatrix(String MMMatrix);
+ return ConversionManager.Partition2CompressedMatrix(MMMatrix);
}
}
\ No newline at end of file
--
GitLab