From 6db55b39c01a8522495f40b38d8d78f926bdc261 Mon Sep 17 00:00:00 2001 From: Chloe Christine Fontenot Date: Sun, 19 Oct 2025 21:30:59 -0500 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 zcmbQDyG5Tjz?+$ci-CcIfx*^OXCki+v#qDjMxQBc%(p$XH$P_E%g7uat}}TthXY7p z@)~}#$q6E?NV;x&XiwJT^a9IPbNYelGn_GCTAM2YO!sjmf$7g&nIPjQ$8*;(8%F9( zzQ;YK{%E*&{%s3^eXqlLiasi@yz*p6U$@?#Xoc>a-7CJQNpO2D%C(%7G2zQGw+H|4 zNxn+-T&BWqJB59gQo0@Ae#vte?%ilKJo8ASqVY=n%KJ9@U(KB|^Xo!psmCvxk*@qc ze%_m;WjjC3Timdmi@nh7hrlP%+sAKRW#^4@*pT>gR`b1j7p@|~J4cJlbSe^e2y`6b zjX3jns)wn6YgzKM-3w1INpXLwrTDde>(|c570H{X^!z>Ztx8!%qLZim{bMtMBR-lH zY5xw(@0VU;$#~Y|jW-`lejoFVBHpDlkImP(I$^`%>$Q)Hf99GBf3)+w8vIK& z0jVvD^Stz?b*ma!8r3W0FI%3*-k@1CXNr-wNu@_q(4JYM#uY9m=FeV6<*OA`cLy)# zT6Zw+pn&1zg!~&h3TI&g#Etl=G&fSv8X9xfxVD`rQ+{Ap{y(Q_g?NkRR5H( z^i%GmE1S5VckM0XZEyWAE_qHU?;%^B+hp#i!QJM$3kt3FtW27->YmB=-dhs?6cbbV z-pIdHkJq?n|9(aa=RBSHAFK{P++C5|$?9X{q^6U1#HBKqPx52C+FSP3i#;CC$doa@ z$A7x((nYtuz26QO6`ItTzkH{<-K~CYao9>@tICa%x0d2YyGq7t+? zrGLj1Rh#D1?o2g&AvP5^#Jg3#PTg`&F~eb&TyCYQ%dIB; zsj19ud-Q1XGa+u9NB8_!-R}=ya-(OT4ga&Q+@HNcN^=`nHJ)dE)QQ_U$M9(T(}nH^ zbDg%IIlO{*{;X-o`$7+I>V2^JqnK0fEmQrNrL~9Zr+4$28T|Py@L?`zQQqG6t8M#g zq8yj7bA|ETPkA`E^N$AaPewDJgHcOl4E{GnG%k5Q{dT+g?Sh&wf?jf`S9r$X)aHrk zy8dM9TO&@j>k{r;j%T+lGFfh*eDr3@_qZqTnjU->UZ${ix!ASdZBK5hZCcrT!~Em! zyEnP&jotamrcAEqxH4@yH?vz>wzL2C7iE^a4$ZRpyV!QOSHrj0qLZfX*b|oN?X@Lw z`=OP^SEtX}TjH`mId)TW+*A#_zajG~^v}Lu^j#}TzyIF1p4GM&bwYI$1Fg!Q%zcAX2N7YVTnvv;n(l<|M@)bJ-k=RW<*>ngENKHtA=**w$Y zefh8V1&b`KFREh*@Mh~vj77FqEG`BUTgSW!G)L}r`cpJ0Wok9VzR&G}%aWG1&O^g3?U;1tvENsZW*>69fwxh)FZC3xb8T1b8Mli1D$7 K2r@7*FaQ9p)^*MR delta 1149 zcmdm@KSh@}z?+$ci-CcIf#GU}_C#JA=BpLj8-1p*F$Yv>ZGOzQmy!8=mDc3N91b9X z$!7%2CO3$(BIydK(weNt=>?Xp=JW&8XE}nfBy+ z+*9i3hWh5;HsIO&JX~P!lf`TAKHE{^+|I*lRdV;j8!?vV9PQ5FXfBmh-+&+c`={6o zSr={cWuGl3KYxjP*Ee=qi31j$hru2!lVLZW{S^ zWcX}oZ{oOTEqfr)CF3y9zNAEj)Z5Q}r3${*+D$vDCi*L|CbgTjzindb>xV0^l$gzB z46c3Bn6#t$q4J&j9<4Jn+ixo`n3R7lxz{@7laQWRnq|{z?>Saaw%#dz@o>?LnW7Fq zogGDRuvGq-H-ImS>Y5OJHC-MUJ&?^6B#w63KU zo01OMM{?Ymye&BtM_M{=I?7WHM(v*72F;3{p}ltjOUZ?ss1iA zyBoQ8cF}y%?P|H*+pf$o`R2~2dAvSOEOSj(f|PZtNH?p85U1I!H=Or zmf9@W*5PDi&suC_HC@)pHu#F2=Cmd6Pr1&~mR`I`EW~VS_72t3$JeH;F)(nm6x^1@ z68zxQRIyw9f3>b9o8(PA;O6`I=9jdxP|LQd$*z5mcR&37;gBllsn$->`_ngNFMd%| zZxZt`f8DP4Pru)dH<=T&Ymv4{WA663QY>>DT01`X)J)2c>7Ds(@2d;7Ip3En94(S@W3JbNF!YXuNqbCwjfsZvk7`(pj4#zNoS3-#qlK*LAJa z>#g0^tFk}ci!EKhK>Ov!CG9WL!g*P;XYyy%x$`@O77FOxmcQ}+?*842q_pNN7B*8{ zE`93Xrhn{Tcg9ZJtM&R1V}Lh1hpfv;?k3ygzdrX7U4KB{Zu#yOoxaRfa&8R zMPS-Sv=U735bfa;F4GP}xM*^a*kZ8p=Y^!1=JQWpD6Br&MqCgq6d*3m^c*7OCCD>* OfjA$Vi2wrw0|Nm5(dx