Update test coverage

This commit is contained in:
2023-06-30 21:59:11 -04:00
parent 2af4da477e
commit cc3442fefa
110 changed files with 1828 additions and 1158 deletions

View File

@@ -1,33 +1,11 @@
//ProjectEulerJava/src/main/java/mattrixwv/ProjectEuler/Problems/Problem11.java
//Matthew Ellison
// Created: 03-03-19
//Modified: 08-20-22
//Modified: 06-27-23
//What is the greatest product of four adjacent numbers in the same direction (up, down, left, right, or diagonally) in the 20×20 grid?
/*
08 02 22 97 38 15 00 40 00 75 04 05 07 78 52 12 50 77 91 08
49 49 99 40 17 81 18 57 60 87 17 40 98 43 69 48 04 56 62 00
81 49 31 73 55 79 14 29 93 71 40 67 53 88 30 03 49 13 36 65
52 70 95 23 04 60 11 42 69 24 68 56 01 32 56 71 37 02 36 91
22 31 16 71 51 67 63 89 41 92 36 54 22 40 40 28 66 33 13 80
24 47 32 60 99 03 45 02 44 75 33 53 78 36 84 20 35 17 12 50
32 98 81 28 64 23 67 10 26 38 40 67 59 54 70 66 18 38 64 70
67 26 20 68 02 62 12 20 95 63 94 39 63 08 40 91 66 49 94 21
24 55 58 05 66 73 99 26 97 17 78 78 96 83 14 88 34 89 63 72
21 36 23 09 75 00 76 44 20 45 35 14 00 61 33 97 34 31 33 95
78 17 53 28 22 75 31 67 15 94 03 80 04 62 16 14 09 53 56 92
16 39 05 42 96 35 31 47 55 58 88 24 00 17 54 24 36 29 85 57
86 56 00 48 35 71 89 07 05 44 44 37 44 60 21 58 51 54 17 58
19 80 81 68 05 94 47 69 28 73 92 13 86 52 17 77 04 89 55 40
04 52 08 83 97 35 99 16 07 97 57 32 16 26 26 79 33 27 98 66
88 36 68 87 57 62 20 72 03 46 33 67 46 55 12 32 63 93 53 69
04 42 16 73 38 25 39 11 24 94 72 18 08 46 29 32 40 62 76 36
20 69 36 41 72 30 23 88 34 62 99 69 82 67 59 85 74 04 36 16
20 73 35 29 78 31 90 01 74 31 49 71 48 86 81 16 23 57 05 54
01 70 54 71 83 51 54 69 16 92 33 48 61 43 52 01 89 19 67 48
*/
//Unless otherwise listed all non-standard includes are my own creation and available from https://bibucket.org/Mattrixwv/JavaClasses
/*
Copyright (C) 2022 Matthew Ellison
Copyright (C) 2023 Matthew Ellison
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@ -45,6 +23,10 @@
package com.mattrixwv.project_euler.problems;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.security.InvalidParameterException;
import java.util.ArrayList;
import java.util.List;
@@ -55,28 +37,10 @@ public class Problem11 extends Problem{
//Variables
//Static variables
//This is the grid of numbers that we will be working with
private static final Integer[][] grid = {{ 8, 2, 22, 97, 38, 15, 0, 40, 0, 75, 4, 5, 7, 78, 52, 12, 50, 77, 91, 8},
{49, 49, 99, 40, 17, 81, 18, 57, 60, 87, 17, 40, 98, 43, 69, 48, 4, 56, 62, 0},
{81, 49, 31, 73, 55, 79, 14, 29, 93, 71, 40, 67, 53, 88, 30, 3, 49, 13, 36, 65},
{52, 70, 95, 23, 4, 60, 11, 42, 69, 24, 68, 56, 1, 32, 56, 71, 37, 2, 36, 91},
{22, 31, 16, 71, 51, 67, 63, 89, 41, 92, 36, 54, 22, 40, 40, 28, 66, 33, 13, 80},
{24, 47, 32, 60, 99, 3, 45, 2, 44, 75, 33, 53, 78, 36, 84, 20, 35, 17, 12, 50},
{32, 98, 81, 28, 64, 23, 67, 10, 26, 38, 40, 67, 59, 54, 70, 66, 18, 38, 64, 70},
{67, 26, 20, 68, 2, 62, 12, 20, 95, 63, 94, 39, 63, 8, 40, 91, 66, 49, 94, 21},
{24, 55, 58, 5, 66, 73, 99, 26, 97, 17, 78, 78, 96, 83, 14, 88, 34, 89, 63, 72},
{21, 36, 23, 9, 75, 0, 76, 44, 20, 45, 35, 14, 0, 61, 33, 97, 34, 31, 33, 95},
{78, 17, 53, 28, 22, 75, 31, 67, 15, 94, 3, 80, 4, 62, 16, 14, 9, 53, 56, 92},
{16, 39, 5, 42, 96, 35, 31, 47, 55, 58, 88, 24, 0, 17, 54, 24, 36, 29, 85, 57},
{86, 56, 0, 48, 35, 71, 89, 7, 5, 44, 44, 37, 44, 60, 21, 58, 51, 54, 17, 58},
{19, 80, 81, 68, 5, 94, 47, 69, 28, 73, 92, 13, 86, 52, 17, 77, 4, 89, 55, 40},
{ 4, 52, 8, 83, 97, 35, 99, 16, 7, 97, 57, 32, 16, 26, 26, 79, 33, 27, 98, 66},
{88, 36, 68, 87, 57, 62, 20, 72, 3, 46, 33, 67, 46, 55, 12, 32, 63, 93, 53, 69},
{ 4, 42, 16, 73, 38, 25, 39, 11, 24, 94, 72, 18, 8, 46, 29, 32, 40, 62, 76, 36},
{20, 69, 36, 41, 72, 30, 23, 88, 34, 62, 99, 69, 82, 67, 59, 85, 74, 4, 36, 16},
{20, 73, 35, 29, 78, 31, 90, 1, 74, 31, 49, 71, 48, 86, 81, 16, 23, 57, 5, 54},
{ 1, 70, 54, 71, 83, 51, 54, 69, 16, 92, 33, 48, 61, 43, 52, 1, 89, 19, 67, 48}};
protected static String FILE_NAME = "files/Problem11Grid.txt";
protected static ArrayList<List<Integer>> grid;
//Instance variables
private ArrayList<Integer> greatestProduct; //Holds the largest product we have found so far
protected List<Integer> greatestProduct; //Holds the largest product we have found so far
//Functions
//Constructor
@@ -85,6 +49,32 @@ public class Problem11 extends Problem{
greatestProduct = new ArrayList<>();
}
//Operational functions
//Read numbers from file into grid
private void readFile(){
if(grid != null){
return;
}
File file = new File(FILE_NAME);
if(file.exists()){
try{
List<String> lines = Files.readAllLines(file.toPath());
grid = new ArrayList<>();
for(String line : lines){
ArrayList<Integer> row = new ArrayList<>();
for(String num : line.split(" ")){
row.add(Integer.parseInt(num));
}
grid.add(row);
}
}
catch(IOException error){
throw new InvalidParameterException("Error reading file", error);
}
}
else{
throw new InvalidParameterException("Error opening file");
}
}
//Solve the problem
@Override
public void solve(){
@@ -102,13 +92,16 @@ public class Problem11 extends Problem{
currentProduct.add(0);
}
//Read the file into the number
readFile();
//Start the timer
timer.start();
//Loop through every row and column
for(int row = 0;row < grid.length;++row){
for(int col = 0;col < grid[row].length;++col){
for(int row = 0;row < grid.size();++row){
for(int col = 0;col < grid.get(row).size();++col){
//Directional booleans to show whether you can move a certain direction
boolean left = false;
boolean right = false;
@@ -118,7 +111,7 @@ public class Problem11 extends Problem{
if((col - 3) >= 1){
left = true;
}
if((col + 3) < grid[row].length){
if((col + 3) < grid.get(row).size()){
right = true;
}
if((row + 3) < 20){
@@ -155,10 +148,10 @@ public class Problem11 extends Problem{
//Check to the right of the current location
private void checkRight(ArrayList<Integer> currentProduct, int row, int col){
//Fill the product
currentProduct.set(0, grid[row][col]);
currentProduct.set(1, grid[row][col + 1]);
currentProduct.set(2, grid[row][col + 2]);
currentProduct.set(3, grid[row][col + 3]);
currentProduct.set(0, grid.get(row).get(col));
currentProduct.set(1, grid.get(row).get(col + 1));
currentProduct.set(2, grid.get(row).get(col + 2));
currentProduct.set(3, grid.get(row).get(col + 3));
//If the current number's product is greater than the greatest product replace it
if(ArrayAlgorithms.getProd(currentProduct) > ArrayAlgorithms.getProd(greatestProduct)){
@@ -171,10 +164,10 @@ public class Problem11 extends Problem{
//Check below the current location
private void checkDown(ArrayList<Integer> currentProduct, int row, int col){
//Fill the product
currentProduct.set(0, grid[row][col]);
currentProduct.set(1, grid[row + 1][col]);
currentProduct.set(2, grid[row + 2][col]);
currentProduct.set(3, grid[row + 3][col]);
currentProduct.set(0, grid.get(row).get(col));
currentProduct.set(1, grid.get(row + 1).get(col));
currentProduct.set(2, grid.get(row + 2).get(col));
currentProduct.set(3, grid.get(row + 3).get(col));
//If the current number's product is greater than the greatest product replace it
if(ArrayAlgorithms.getProd(currentProduct) > ArrayAlgorithms.getProd(greatestProduct)){
@@ -187,10 +180,10 @@ public class Problem11 extends Problem{
//Check the left-down diagonal from the current location
private void checkLeftDown(ArrayList<Integer> currentProduct, int row, int col){
//Fill the product
currentProduct.set(0, grid[row][col]);
currentProduct.set(1, grid[row + 1][col - 1]);
currentProduct.set(2, grid[row + 2][col - 2]);
currentProduct.set(3, grid[row + 3][col - 3]);
currentProduct.set(0, grid.get(row).get(col));
currentProduct.set(1, grid.get(row + 1).get(col - 1));
currentProduct.set(2, grid.get(row + 2).get(col - 2));
currentProduct.set(3, grid.get(row + 3).get(col - 3));
//If the current number's product is greater than the greatest product replace it
if(ArrayAlgorithms.getProd(currentProduct) > ArrayAlgorithms.getProd(greatestProduct)){
@@ -203,10 +196,10 @@ public class Problem11 extends Problem{
//Check the right-down diagonal from the current location
private void checkRightDown(ArrayList<Integer> currentProduct, int row, int col){
//Fill the product
currentProduct.set(0, grid[row][col]);
currentProduct.set(1, grid[row + 1][col + 1]);
currentProduct.set(2, grid[row + 2][col + 2]);
currentProduct.set(3, grid[row + 3][col + 3]);
currentProduct.set(0, grid.get(row).get(col));
currentProduct.set(1, grid.get(row + 1).get(col + 1));
currentProduct.set(1, grid.get(row + 2).get(col + 2));
currentProduct.set(1, grid.get(row + 3).get(col + 3));
//If the current number's product is greater than the greatest product replace it
if(ArrayAlgorithms.getProd(currentProduct) > ArrayAlgorithms.getProd(greatestProduct)){