From 5c30e7d434dd2d18a3970b3dfeb54442fe0e9532 Mon Sep 17 00:00:00 2001 From: Mattrixwv Date: Sat, 1 Jul 2023 15:05:47 -0400 Subject: [PATCH] Update sonarqube findings --- .../com/mattrixwv/project_euler/problems/Problem11.java | 6 +++--- .../com/mattrixwv/project_euler/problems/Problem13.java | 6 +++--- .../com/mattrixwv/project_euler/problems/Problem18.java | 4 ++-- .../com/mattrixwv/project_euler/problems/Problem22.java | 4 ++-- .../com/mattrixwv/project_euler/problems/Problem42.java | 4 ++-- .../com/mattrixwv/project_euler/problems/Problem67.java | 2 +- .../com/mattrixwv/project_euler/problems/Problem8.java | 6 +++--- .../com/mattrixwv/project_euler/problems/Problem9.java | 8 ++++---- .../mattrixwv/project_euler/problems/TestProblem11.java | 4 ++-- .../mattrixwv/project_euler/problems/TestProblem13.java | 4 ++-- .../mattrixwv/project_euler/problems/TestProblem18.java | 6 +++--- .../mattrixwv/project_euler/problems/TestProblem22.java | 4 ++-- .../mattrixwv/project_euler/problems/TestProblem42.java | 4 ++-- .../mattrixwv/project_euler/problems/TestProblem67.java | 6 +++--- .../mattrixwv/project_euler/problems/TestProblem8.java | 4 ++-- .../mattrixwv/project_euler/problems/TestProblem9.java | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem11.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem11.java index 26b443d..d1e0552 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem11.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem11.java @@ -37,7 +37,7 @@ public class Problem11 extends Problem{ //Variables //Static variables //This is the grid of numbers that we will be working with - protected static String FILE_NAME = "files/Problem11Grid.txt"; + protected static String fileName = "files/Problem11Grid.txt"; protected static ArrayList> grid; //Instance variables protected List greatestProduct; //Holds the largest product we have found so far @@ -50,11 +50,11 @@ public class Problem11 extends Problem{ } //Operational functions //Read numbers from file into grid - private void readFile(){ + private static void readFile(){ if(grid != null){ return; } - File file = new File(FILE_NAME); + File file = new File(fileName); if(file.exists()){ try{ List lines = Files.readAllLines(file.toPath()); diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem13.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem13.java index 723b436..1d25599 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem13.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem13.java @@ -37,7 +37,7 @@ import com.mattrixwv.ArrayAlgorithms; public class Problem13 extends Problem{ //Variables //Static variables - protected static String FILE_NAME = "files/Problem13Numbers.txt"; + protected static String fileName = "files/Problem13Numbers.txt"; protected static ArrayList nums; //Holds the numbers that are being summed //Instance variables protected BigInteger sum; //The sum of all the numbers @@ -50,11 +50,11 @@ public class Problem13 extends Problem{ } //Operational functions //Read number from file into nums - private void readFile(){ + private static void readFile(){ if(nums != null){ return; } - File file = new File(FILE_NAME); + File file = new File(fileName); if(file.exists()){ try{ List lines = Files.readAllLines(file.toPath()); diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java index e740735..21fde11 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem18.java @@ -62,7 +62,7 @@ public class Problem18 extends Problem{ //Variables //Static variables - protected String FILE_NAME = "files/Problem18Pyramid.txt"; + protected String fileName = "files/Problem18Pyramid.txt"; protected static ArrayList> list; //The list to hold the numbers in //Instance variables protected ArrayList foundPoints; //For the points that you have already found the shortest distance to @@ -83,7 +83,7 @@ public class Problem18 extends Problem{ if(list != null){ return; } - File file = new File(FILE_NAME); + File file = new File(fileName); if(file.exists()){ try{ List lines = Files.readAllLines(file.toPath()); diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem22.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem22.java index 7a721b2..f3f4d1d 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem22.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem22.java @@ -37,7 +37,7 @@ import java.util.List; public class Problem22 extends Problem{ //Variables //Static variables - protected static String FILE_NAME = "files/Problem22Names.txt"; + protected static String fileName = "files/Problem22Names.txt"; //Holds the names that will be scored protected static ArrayList names = new ArrayList<>(); //Instance variables @@ -59,7 +59,7 @@ public class Problem22 extends Problem{ if(!names.isEmpty()){ return; } - File file = new File(FILE_NAME); + File file = new File(fileName); if(file.exists()){ try{ List lines = Files.readAllLines(file.toPath()); diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem42.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem42.java index fbffcc0..8da94e4 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem42.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem42.java @@ -34,7 +34,7 @@ import java.util.List; public class Problem42 extends Problem{ //Variables //Static variables - protected static String FILE_NAME = "files/Problem42Words.txt"; + protected static String fileName = "files/Problem42Words.txt"; protected static ArrayList fileWords = new ArrayList<>(); //Instance variables protected ArrayList triangleWords; @@ -51,7 +51,7 @@ public class Problem42 extends Problem{ if(!fileWords.isEmpty()){ return; } - File file = new File(FILE_NAME); + File file = new File(fileName); if(file.exists()){ try{ List lines = Files.readAllLines(file.toPath()); diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem67.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem67.java index ba9d07b..cb05059 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem67.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem67.java @@ -28,7 +28,7 @@ public class Problem67 extends Problem18{ //Setup the list of numbers to check public Problem67(){ super(); - FILE_NAME = "files/Problem67Pyramid.txt"; + fileName = "files/Problem67Pyramid.txt"; } } diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem8.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem8.java index 183e8ed..cae163b 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem8.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem8.java @@ -32,7 +32,7 @@ public class Problem8 extends Problem{ //Variables //Static variables //The 1000 digit number to check - protected static String FILE_NAME = "files/Problem8Number.txt"; + protected static String fileName = "files/Problem8Number.txt"; protected static String number; //Instance variables protected String maxNums; //Holds the string of the largest product @@ -47,11 +47,11 @@ public class Problem8 extends Problem{ } //Operational functions //Read number from file into number - private void readFile(){ + private static void readFile(){ if(number != null){ return; } - File file = new File(FILE_NAME); + File file = new File(fileName); if(file.exists()){ try{ List lines = Files.readAllLines(file.toPath()); diff --git a/src/main/java/com/mattrixwv/project_euler/problems/Problem9.java b/src/main/java/com/mattrixwv/project_euler/problems/Problem9.java index 9cf998f..31c3950 100644 --- a/src/main/java/com/mattrixwv/project_euler/problems/Problem9.java +++ b/src/main/java/com/mattrixwv/project_euler/problems/Problem9.java @@ -29,7 +29,7 @@ import com.mattrixwv.project_euler.exceptions.Unsolved; public class Problem9 extends Problem{ //Variables //Static variables - protected int GOAL_SUM = 1000; //The number that we want the sum of a, b, and c to equal + protected int goalSum = 1000; //The number that we want the sum of a, b, and c to equal //Instance variables protected int a; //The size of the first side protected int b; //The size of the second side @@ -59,18 +59,18 @@ public class Problem9 extends Problem{ //Loop through all possible a's - while((a < GOAL_SUM) && !found){ + while((a < goalSum) && !found){ b = a + 1; //b must be larger than a c = Math.sqrt((a * a) + (double)(b * b)); //Compute the hyp //Loop through all possible b's for this a - while((a + b + c) < GOAL_SUM){ + while((a + b + c) < goalSum){ ++b; c = Math.sqrt((a * a) + (double)(b * b)); } //If the sum == 1000 you found the number, otherwise go to the next possible a - if((a + b + c) == GOAL_SUM){ + if((a + b + c) == goalSum){ found = true; } else{ diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java index 769007c..c6335f3 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem11.java @@ -66,7 +66,7 @@ public class TestProblem11 extends TestProblemBase{ problem.reset(); Problem11.grid = null; - RandomAccessFile file = new RandomAccessFile(Problem11.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(Problem11.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -81,7 +81,7 @@ public class TestProblem11 extends TestProblemBase{ problem.reset(); Problem11.grid = null; - Problem11.FILE_NAME = "/a"; + Problem11.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java index 81f03a6..6eefcca 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem13.java @@ -64,7 +64,7 @@ public class TestProblem13 extends TestProblemBase{ problem.reset(); Problem13.nums = null; - RandomAccessFile file = new RandomAccessFile(Problem13.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(Problem13.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -79,7 +79,7 @@ public class TestProblem13 extends TestProblemBase{ problem.reset(); Problem13.nums = null; - Problem13.FILE_NAME = "/a"; + Problem13.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java index d85cdae..9e9aae1 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem18.java @@ -63,7 +63,7 @@ public class TestProblem18 extends TestProblemBase{ @Override public void verifyReset(){ - assertEquals("files/Problem18Pyramid.txt", problem.FILE_NAME); + assertEquals("files/Problem18Pyramid.txt", problem.fileName); assertEquals(new ArrayList<>(), problem.foundPoints); assertEquals(new ArrayList<>(), problem.possiblePoints); assertEquals(0, problem.actualTotal); @@ -74,7 +74,7 @@ public class TestProblem18 extends TestProblemBase{ problem.reset(); Problem18.list = null; - RandomAccessFile file = new RandomAccessFile(problem.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(problem.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -89,7 +89,7 @@ public class TestProblem18 extends TestProblemBase{ problem.reset(); Problem18.list = null; - problem.FILE_NAME = "/a"; + problem.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java index 6bb6be8..2424d1f 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem22.java @@ -69,7 +69,7 @@ public class TestProblem22 extends TestProblemBase{ problem.reset(); Problem22.names = new ArrayList<>(); - RandomAccessFile file = new RandomAccessFile(Problem22.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(Problem22.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -84,7 +84,7 @@ public class TestProblem22 extends TestProblemBase{ problem.reset(); Problem22.names = new ArrayList<>(); - Problem22.FILE_NAME = "/a"; + Problem22.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java index 6822f30..2d038a7 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem42.java @@ -63,7 +63,7 @@ public class TestProblem42 extends TestProblemBase{ problem.reset(); Problem42.fileWords = new ArrayList<>(); - RandomAccessFile file = new RandomAccessFile(Problem42.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(Problem42.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -78,7 +78,7 @@ public class TestProblem42 extends TestProblemBase{ problem.reset(); Problem42.fileWords = new ArrayList<>(); - Problem42.FILE_NAME = "/a"; + Problem42.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java index 8b749eb..de8dd2e 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem67.java @@ -58,7 +58,7 @@ public class TestProblem67 extends TestProblemBase{ @Override public void verifyReset(){ - assertEquals("files/Problem67Pyramid.txt", problem.FILE_NAME); + assertEquals("files/Problem67Pyramid.txt", problem.fileName); assertEquals(new ArrayList<>(), problem.foundPoints); assertEquals(new ArrayList<>(), problem.possiblePoints); assertEquals(0, problem.actualTotal); @@ -69,7 +69,7 @@ public class TestProblem67 extends TestProblemBase{ problem.reset(); Problem67.list = null; - RandomAccessFile file = new RandomAccessFile(problem.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(problem.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -84,7 +84,7 @@ public class TestProblem67 extends TestProblemBase{ problem.reset(); Problem67.list = null; - problem.FILE_NAME = "/a"; + problem.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java index 7371032..7e8cec2 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem8.java @@ -66,7 +66,7 @@ public class TestProblem8 extends TestProblemBase{ problem.reset(); Problem8.number = null; - RandomAccessFile file = new RandomAccessFile(Problem8.FILE_NAME, "rw"); + RandomAccessFile file = new RandomAccessFile(Problem8.fileName, "rw"); file.getChannel().lock(); assertThrows(InvalidParameterException.class, () -> { @@ -81,7 +81,7 @@ public class TestProblem8 extends TestProblemBase{ problem.reset(); Problem8.number = null; - Problem8.FILE_NAME = "/a"; + Problem8.fileName = "/a"; assertThrows(InvalidParameterException.class, () -> { problem.solve(); diff --git a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java index 77dcffc..ed00952 100644 --- a/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java +++ b/src/test/java/com/mattrixwv/project_euler/problems/TestProblem9.java @@ -68,7 +68,7 @@ public class TestProblem9 extends TestProblemBase{ @Test public void testSolve_notFound(){ problem.reset(); - problem.GOAL_SUM = 1; + problem.goalSum = 1; assertThrows(Unsolved.class, () -> { problem.solve();