From d0ae2478a17c9768ffa990cb50b89bbd8b8086a2 Mon Sep 17 00:00:00 2001 From: Caleb Fontenot Date: Thu, 12 Jan 2023 11:55:40 -0600 Subject: [PATCH] Actually fix the freaking arrays --- .gitignore | 1 + .../lab-2D-arrays-sort_CalebFontenot.html | 121 ++++++++++++------ .../Lab2DArraysSort_CalebFontenot.java | 59 ++++++++- .../Assignments/lab3_CalebFontenot/pom.xml | 14 ++ .../lab3_calebfontenot/Employee.java | 50 ++++++++ .../Lab3_CalebFontenot.java | 16 +++ .../ZIPs/lab-2D-arrays-sort_CalebFontenot.zip | Bin 5780 -> 6068 bytes 7 files changed, 218 insertions(+), 43 deletions(-) create mode 100644 Semester 2/Assignments/lab3_CalebFontenot/pom.xml create mode 100644 Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Employee.java create mode 100644 Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Lab3_CalebFontenot.java diff --git a/.gitignore b/.gitignore index a29df73..25311ff 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /Semester 1/Test Project/target/ /Semester 2/Assignments/lab-2D-arrays_CalebFontenot/target/ /Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/target/ +/Semester 2/Assignments/lab3_CalebFontenot/target/ diff --git a/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/lab-2D-arrays-sort_CalebFontenot.html b/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/lab-2D-arrays-sort_CalebFontenot.html index 455b44d..e8d631a 100644 --- a/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/lab-2D-arrays-sort_CalebFontenot.html +++ b/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/lab-2D-arrays-sort_CalebFontenot.html @@ -5,20 +5,21 @@ @@ -32,63 +33,92 @@ table {color: #888888; background-color: #313335; font-family: monospace; font-w /** * - * @author caleb + * @author caleb */ public class Lab2DArraysSort_CalebFontenot { - public static int maxNumberOfColumnsInJagged2dArray(char[][] ar) { + public static int maxNumberOfColumnsInJagged2dArray(char[][] ar) + { int maxNumberOfColumns = 0; - for (int row = 0; row < ar.length; ++row) { - if (ar[row].length > maxNumberOfColumns) { - maxNumberOfColumns = ar[row].length; + for (int row = 0; row < ar.length; ++row) { + if (ar[row].length > maxNumberOfColumns) { + maxNumberOfColumns = ar[row].length; } } return maxNumberOfColumns; } - public static void printColumnMajorOrder(char[][] ar) { + public static void printColumnMajorOrder(char[][] ar) + { int row = 0; int column = 0; - int max = maxNumberOfColumnsInJagged2dArray(ar); + int max = maxNumberOfColumnsInJagged2dArray(ar); for (column = 0; column < max; ++column) { - for (row = 0; row < ar.length; ++row) { - if (column < ar[row].length) { - System.out.print(ar[row][column] + " "); + for (row = 0; row < ar.length; ++row) { + if (column < ar[row].length) { + System.out.print(ar[row][column] + " "); } } - System.out.println(""); + System.out.println(""); } } /** * Prints row by row * - * @param ar + * @param ar */ - public static void printRowMajorOrder(char[][] ar)//normal + public static void printRowMajorOrder(char[][] ar)//normal { - for (int x = 0; x < ar.length; ++x) { - for (int y = 0; y < ar[x].length; ++y) { - System.out.print(ar[x][y] + ""); + for (int x = 0; x < ar.length; ++x) { + for (int y = 0; y < ar[x].length; ++y) { + System.out.print(ar[x][y] + ""); } - System.out.println(); + System.out.println(); } } + public static String returnRowMajorOrder(char[] ar)//normal + { + String returnString = ""; + for (int x = 0; x < ar.length; ++x) { + returnString += ar[x]; + } + return returnString; + } /** * Sorts the methods in ascending order using Selection Sort * - * @param names the names to be sorted + * @param names the names to be sorted */ - public static void sortNames(char[][] names) { - for (int i = 0; i < names.length - 1; ++i) { - for (int j = i + 1; j < names.length; ++j) { + public static void sortNames(char[][] names) + { + for (int i = 0; i < names.length - 1; ++i) { + for (int j = i + 1; j < names.length; ++j) { char compChar1 = names[i][0], compChar2 = names[j][0]; // Reoder entire row - for (int rowIterate = 0; rowIterate < maxNumberOfColumnsInJagged2dArray(names); ++rowIterate) { - if (Character.toLowerCase(compChar1) > Character.toLowerCase(compChar2)) { + for (int rowIterate = 1; rowIterate < maxNumberOfColumnsInJagged2dArray(names); ++rowIterate) { + if (Character.toLowerCase(compChar1) == Character.toLowerCase(compChar2)) { + try { + compChar1 = names[i][rowIterate]; + compChar2 = names[j][rowIterate]; + } catch (Exception ex) { + // If it's failed, the index has gone out of range. + // Check the length of the arrays and swap the larger one with the smaller one. + if (names[i].length > names[j].length) { + //System.out.println(names[i].length + " " + names[j].length); + //System.out.println("Swapping " + returnRowMajorOrder(names[i]) + " with " + returnRowMajorOrder(names[j])); + char[] temp = names[i]; + names[i] = names[j]; + names[j] = temp; + } + break; + } + + } + if (Character.toLowerCase(compChar1) > Character.toLowerCase(compChar2)) { char[] temp = names[i]; names[i] = names[j]; names[j] = temp; @@ -97,16 +127,33 @@ table {color: #888888; background-color: #313335; font-family: monospace; font-w } } } - public static void main(String[] args) { + + public static void main(String[] args) + { + /* +char[][] names = { + {'j', 'o', 'h', 'n'}, + {'a', 'n'}, + {'b', 'y', 'r', 'o', 'n'},}; + */ + ///* char[][] names = { {'j', 'o', 'h', 'n'}, {'a', 'n'}, - {'b', 'y', 'r', 'o', 'n'},}; + {'b', 'y', 'r', 'o', 'n'}, + {'b', 'y', 'r', 'o', 'n', 'i'}, + {'a', 'a', 'o', 'n'}, + {'b', 'b', 'b', 'b'}, + {'b', 'b', 'b', 'c'}, + {'b', 'b', 'b'} + }; +//*/ //printColumnMajorOrder(names); - printRowMajorOrder(names); - System.out.println(); - sortNames(names); - printRowMajorOrder(names); + printRowMajorOrder(names); + System.out.println(); + sortNames(names); + //System.out.println(); + printRowMajorOrder(names); //printColumnMajorOrder(names); } diff --git a/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/src/main/java/com/calebfontenot/lab/d/arrays/sort_calebfontenot/Lab2DArraysSort_CalebFontenot.java b/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/src/main/java/com/calebfontenot/lab/d/arrays/sort_calebfontenot/Lab2DArraysSort_CalebFontenot.java index 5179ba7..7c27eec 100644 --- a/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/src/main/java/com/calebfontenot/lab/d/arrays/sort_calebfontenot/Lab2DArraysSort_CalebFontenot.java +++ b/Semester 2/Assignments/lab-2D-arrays-sort_CalebFontenot/src/main/java/com/calebfontenot/lab/d/arrays/sort_calebfontenot/Lab2DArraysSort_CalebFontenot.java @@ -9,7 +9,8 @@ package com.calebfontenot.lab.d.arrays.sort_calebfontenot; */ public class Lab2DArraysSort_CalebFontenot { - public static int maxNumberOfColumnsInJagged2dArray(char[][] ar) { + public static int maxNumberOfColumnsInJagged2dArray(char[][] ar) + { int maxNumberOfColumns = 0; for (int row = 0; row < ar.length; ++row) { if (ar[row].length > maxNumberOfColumns) { @@ -20,7 +21,8 @@ public class Lab2DArraysSort_CalebFontenot { return maxNumberOfColumns; } - public static void printColumnMajorOrder(char[][] ar) { + public static void printColumnMajorOrder(char[][] ar) + { int row = 0; int column = 0; int max = maxNumberOfColumnsInJagged2dArray(ar); @@ -49,19 +51,47 @@ public class Lab2DArraysSort_CalebFontenot { } } + public static String returnRowMajorOrder(char[] ar)//normal + { + String returnString = ""; + for (int x = 0; x < ar.length; ++x) { + returnString += ar[x]; + } + return returnString; + } /** * Sorts the methods in ascending order using Selection Sort * * @param names the names to be sorted */ - public static void sortNames(char[][] names) { + public static void sortNames(char[][] names) + { for (int i = 0; i < names.length - 1; ++i) { for (int j = i + 1; j < names.length; ++j) { char compChar1 = names[i][0], compChar2 = names[j][0]; // Reoder entire row - for (int rowIterate = 0; rowIterate < maxNumberOfColumnsInJagged2dArray(names); ++rowIterate) { + for (int rowIterate = 1; rowIterate < maxNumberOfColumnsInJagged2dArray(names); ++rowIterate) { + if (Character.toLowerCase(compChar1) == Character.toLowerCase(compChar2)) { + try { + compChar1 = names[i][rowIterate]; + compChar2 = names[j][rowIterate]; + } catch (Exception ex) { + // If it's failed, the index has gone out of range. + // Check the length of the arrays and swap the larger one with the smaller one. + if (names[i].length > names[j].length) { + System.out.println(names[i].length + " " + names[j].length); + System.out.println("Swapping " + returnRowMajorOrder(names[i]) + " with " + returnRowMajorOrder(names[j])); + char[] temp = names[i]; + names[i] = names[j]; + names[j] = temp; + } + break; + } + + } if (Character.toLowerCase(compChar1) > Character.toLowerCase(compChar2)) { + System.out.println("Swapping " + returnRowMajorOrder(names[i]) + " with " + returnRowMajorOrder(names[j])); char[] temp = names[i]; names[i] = names[j]; names[j] = temp; @@ -70,15 +100,32 @@ public class Lab2DArraysSort_CalebFontenot { } } } - public static void main(String[] args) { - char[][] names = { + + public static void main(String[] args) + { + /* +char[][] names = { {'j', 'o', 'h', 'n'}, {'a', 'n'}, {'b', 'y', 'r', 'o', 'n'},}; + */ + ///* + char[][] names = { + {'j', 'o', 'h', 'n'}, + {'a', 'n'}, + {'b', 'y', 'r', 'o', 'n'}, + {'b', 'y', 'r', 'o', 'n', 'i'}, + {'a', 'a', 'o', 'n'}, + {'b', 'b', 'b', 'b'}, + {'b', 'b', 'b', 'c'}, + {'b', 'b', 'b'} + }; +//*/ //printColumnMajorOrder(names); printRowMajorOrder(names); System.out.println(); sortNames(names); + System.out.println(); printRowMajorOrder(names); //printColumnMajorOrder(names); diff --git a/Semester 2/Assignments/lab3_CalebFontenot/pom.xml b/Semester 2/Assignments/lab3_CalebFontenot/pom.xml new file mode 100644 index 0000000..7e2fd56 --- /dev/null +++ b/Semester 2/Assignments/lab3_CalebFontenot/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + com.calebfontenot + lab3_CalebFontenot + 1.0-SNAPSHOT + jar + + UTF-8 + 17 + 17 + com.calebfontenot.lab3_calebfontenot.Lab3_CalebFontenot + + \ No newline at end of file diff --git a/Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Employee.java b/Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Employee.java new file mode 100644 index 0000000..22e8251 --- /dev/null +++ b/Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Employee.java @@ -0,0 +1,50 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package com.calebfontenot.lab3_calebfontenot; + +/** + * + * @author caleb + */ +public class Employee { + + private String name; + + public Employee(String name) + { + this.name = name; + } + + + /** + * Get the value of name + * + * @return the value of name + */ + public String getName() + { + return name; + } + + /** + * Set the value of name + * + * @param name new value of name + */ + public void setName(String name) + { + this.name = name; + } + + public static void main(String[] args) + { + Employee e = new Employee(); + e.setName("John Wayne"); + System.out.println(e.getName()); + + Employee e1 = new Employee("Mary Poppins"); + System.out.println(e1.getName()); + } +} diff --git a/Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Lab3_CalebFontenot.java b/Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Lab3_CalebFontenot.java new file mode 100644 index 0000000..76fb718 --- /dev/null +++ b/Semester 2/Assignments/lab3_CalebFontenot/src/main/java/com/calebfontenot/lab3_calebfontenot/Lab3_CalebFontenot.java @@ -0,0 +1,16 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + */ + +package com.calebfontenot.lab3_calebfontenot; + +/** + * + * @author caleb + */ +public class Lab3_CalebFontenot { + + public static void main(String[] args) { + System.out.println("Hello World!"); + } +} diff --git a/Semester 2/ZIPs/lab-2D-arrays-sort_CalebFontenot.zip b/Semester 2/ZIPs/lab-2D-arrays-sort_CalebFontenot.zip index e083d615805960a945b9492f3e4589bbe9a4cbdb..8642909c240dd49988cf25eec37b8b44d22b6f6e 100644 GIT binary patch delta 1439 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 G00IF1(dx