Bläddra i källkod

Fix code policies

bastien.monsarrat 7 år sedan
förälder
incheckning
ac74fdac17
4 ändrade filer med 26 tillägg och 22 borttagningar
  1. 4 4
      D5.1/Program.cs
  2. 7 7
      D5.2/Program.cs
  3. 6 6
      D6.1/Program.cs
  4. 9 5
      D6.Bonus/Program.cs

+ 4 - 4
D5.1/Program.cs

@@ -13,12 +13,12 @@ namespace D5._1
             var file = File.OpenText(args[0]);
 
             string polymer = file.ReadLine();
-            reduce(ref polymer);
+            Reduce(ref polymer);
 
             Console.WriteLine(polymer.Length);
         }
 
-        static void reduce(ref string polymer)
+        static void Reduce(ref string polymer)
         {
             for (int i = 1; i < polymer.Length; i++)
             {
@@ -26,7 +26,7 @@ namespace D5._1
                 char cm = polymer[i-1];
 
                 if (Math.Abs(cc - cm) <= 26) continue;
-                if (up(cc) == up(cm))
+                if (Up(cc) == Up(cm))
                 {
                     polymer = polymer.Remove(i - 1, 2);
                     i = Math.Max(0, i - 2);
@@ -34,7 +34,7 @@ namespace D5._1
             }
         }
 
-        static char up(char c)
+        static char Up(char c)
         {
             if (c >= 'A' && c <= 'Z') return c;
             return (char) ('A' + (c - 'a')); 

+ 7 - 7
D5.2/Program.cs

@@ -18,8 +18,8 @@ namespace D5._2
             int shortest = polymer.Length;
             for (char i = 'A'; i <= 'Z'; i++)
             {
-                var altera = alterPolymer(polymer, i);
-                reduce(ref altera);
+                var altera = AlterPolymer(polymer, i);
+                Reduce(ref altera);
 
                 if (altera.Length < shortest) shortest = altera.Length;
             }
@@ -27,7 +27,7 @@ namespace D5._2
             Console.WriteLine(shortest);
         }
 
-        static void reduce(ref string polymer)
+        static void Reduce(ref string polymer)
         {
             for (int i = 1; i < polymer.Length; i++)
             {
@@ -35,7 +35,7 @@ namespace D5._2
                 char cm = polymer[i - 1];
 
                 if (Math.Abs(cc - cm) <= 26) continue;
-                if (up(cc) == up(cm))
+                if (Up(cc) == Up(cm))
                 {
                     polymer = polymer.Remove(i - 1, 2);
                     i = Math.Max(0, i - 2);
@@ -43,18 +43,18 @@ namespace D5._2
             }
         }
 
-        static string alterPolymer(string polymer, char unit)
+        static string AlterPolymer(string polymer, char unit)
         {
             string newPolymer = string.Empty;
             foreach (var car in polymer)
             {
-                if (up(car) == up(unit)) continue;
+                if (Up(car) == Up(unit)) continue;
                 newPolymer += car;
             }
             return newPolymer;
         }
 
-        static char up(char c)
+        static char Up(char c)
         {
             if (c >= 'A' && c <= 'Z') return c;
             return (char)('A' + (c - 'a'));

+ 6 - 6
D6.1/Program.cs

@@ -27,16 +27,16 @@ namespace D6._1
 
             var area = new int[coordinates.Count];
 
-            fillMapArea(size, coordinates, area);
+            FillMapArea(size, coordinates, area);
 
-            flagPointOnEdges(size, coordinates);
+            FlagPointOnEdges(size, coordinates);
 
-            int maxArea = findMaxCoveredArea(coordinates, area);
+            int maxArea = FindMaxCoveredArea(coordinates, area);
 
             Console.WriteLine($"Answer : {maxArea}");
         }
 
-        private static int findMaxCoveredArea(List<((uint x, uint y) coord, bool isInfinite)> coordinates, int[] area)
+        private static int FindMaxCoveredArea(List<((uint x, uint y) coord, bool isInfinite)> coordinates, int[] area)
         {
             int maxArea = 0;
             for (int i = 0; i < area.Length; ++i)
@@ -49,7 +49,7 @@ namespace D6._1
             return maxArea;
         }
 
-        private static void flagPointOnEdges(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates)
+        private static void FlagPointOnEdges(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates)
         {
             for (uint i = 0; i < size; ++i)
             {
@@ -67,7 +67,7 @@ namespace D6._1
             }
         }
 
-        private static void fillMapArea(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates, int[] area)
+        private static void FillMapArea(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates, int[] area)
         {
             for (uint x = 0; x < size; x++)
             {

+ 9 - 5
D6.Bonus/Program.cs

@@ -40,9 +40,9 @@ namespace D6.Bonus
 
             var area = new (int closest, int total)[size, size];
 
-            fillMapArea(size, coordinates, area);
+            FillMapArea(size, coordinates, area);
 
-            flagPointOnEdges(size, coordinates);
+            FlagPointOnEdges(size, coordinates);
 
             GenerateBitMap(ceil, coordinates, size, area);
         }
@@ -93,7 +93,7 @@ namespace D6.Bonus
             bmp.Save("result.bmp");
         }
 
-        private static int findMaxCoveredArea(List<((uint x, uint y) coord, bool isInfinite)> coordinates, int[] area)
+        private static int FindMaxCoveredArea(List<((uint x, uint y) coord, bool isInfinite)> coordinates, int[] area)
         {
             int maxArea = 0;
             for (int i = 0; i < area.Length; ++i)
@@ -106,10 +106,12 @@ namespace D6.Bonus
             return maxArea;
         }
 
-        private static void flagPointOnEdges(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates)
+        private static void FlagPointOnEdges(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates)
         {
             for (uint i = 0; i < size; ++i)
             {
+#pragma warning disable IDE0042 // Deconstruct variable declaration
+
                 var x0yi = GetClosest(coordinates, (0, i));
                 MarkInfinite(coordinates, x0yi.closest);
 
@@ -121,10 +123,12 @@ namespace D6.Bonus
 
                 var xiysize = GetClosest(coordinates, (i, size));
                 MarkInfinite(coordinates, xiysize.closest);
+
+#pragma warning restore IDE0042 // Deconstruct variable declaration
             }
         }
 
-        private static void fillMapArea(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates, (int closest, int total)[,] area)
+        private static void FillMapArea(uint size, List<((uint x, uint y) coord, bool isInfinite)> coordinates, (int closest, int total)[,] area)
         {
             for (uint x = 0; x < size; x++)
             {