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
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("");
}
}
- ar
+@param ar
- public static void printRowMajorOrder(char[][] ar)
+ public static void printRowMajorOrder(char[][] ar)
{
- 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)
+ {
+ String returnString = "";
+ for (int x = 0; x < ar.length; ++x) {
+ returnString += ar[x];
+ }
+ return returnString;
+ }
- names
+@param 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) {
+ 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];
- 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 (names[i].length > names[j].length) {
+
+
+ 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'},};
+ {'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'}
+ };
+
- printRowMajorOrder(names);
- System.out.println();
- sortNames(names);
- printRowMajorOrder(names);
+ printRowMajorOrder(names);
+ System.out.println();
+ sortNames(names);
+
+ printRowMajorOrder(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 e083d61..8642909 100644
Binary files a/Semester 2/ZIPs/lab-2D-arrays-sort_CalebFontenot.zip and b/Semester 2/ZIPs/lab-2D-arrays-sort_CalebFontenot.zip differ