diff --git a/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test.java b/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test.java index 60739a6..dac5d10 100644 --- a/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test.java +++ b/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test.java @@ -8,9 +8,18 @@ package com.calebfontenot.test; * * @author caleb */ +import java.math.*; public class Test { public static void main(String[] args) { - System.out.println("Hello World!"); + double d = 47; + String string = d + ""; + BigDecimal bigInt = new BigDecimal(36); + System.out.println(bigInt); + + char[] charArray = {'a', 'b', 'c', 'd'}; + System.out.println(new String(charArray)); + + Thread.sleep(); } } diff --git a/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test3.java b/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test3.java new file mode 100644 index 0000000..7d0088a --- /dev/null +++ b/ASDV-Help/Test/Test/src/main/java/com/calebfontenot/test/Test3.java @@ -0,0 +1,15 @@ +/* + * 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.test; + +/** + * + * @author caleb + */ +public class Test3 { + public static void main(String[] args) { + System.out.println(Math.PI); + } +} diff --git a/Semester 2/Assignments/MP3_CalebFontenot/src/mp3_calebfontenot/MP3_CalebFontenot copy.java b/Semester 2/Assignments/MP3_CalebFontenot/src/mp3_calebfontenot/MP3_CalebFontenot copy.java new file mode 100644 index 0000000..ab4bffe --- /dev/null +++ b/Semester 2/Assignments/MP3_CalebFontenot/src/mp3_calebfontenot/MP3_CalebFontenot copy.java @@ -0,0 +1,144 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Main.java to edit this template + */ +package mp3_calebfontenot; + +import java.util.Scanner; + +/** + * + * @author caleb + */ +public class MP3_CalebFontenot { + + /** + * @param args the command line arguments + */ + public static void main(String[] args) + { + Scanner input = new Scanner(System.in); + System.out.print("Enter the first complex number: "); + double a = 3; + double b = 5; + Complex c1 = new Complex(a, b); + System.out.print("Enter the second complex number: "); + double c = 7; + double d = 9; + Complex c2 = new Complex(c, d); + System.out.println("(" + c1 + ")" + " + " + "(" + c2 + ")" + " = " + + c1.add(c2)); + System.out.println("(" + c1 + ")" + " - " + "(" + c2 + ")" + " = " + + c1.subtract(c2)); + System.out.println("(" + c1 + ")" + " * " + "(" + c2 + ")" + " = " + + c1.multiply(c2)); + System.out.println("(" + c1 + ")" + " / " + "(" + c2 + ")" + " = " + + c1.divide(c2)); + System.out.println("|" + c1 + "| = " + c1.abs()); + Complex c3 = (Complex) c1.clone(); + System.out.println(c1 == c3); + System.out.println(c3.getRealPart()); + System.out.println(c3.getImaginaryPart()); + } + + + +} + +class Complex { + + private double a; + private double b; + private final double i = Math.sqrt(-1); + + public Complex() + { + this.a = 0; + } + + public Complex(double a) + { + this.a = a; + this.b = 0; + } + + public Complex(double a, double b) + { + this.a = a; + this.b = b; + } + + public Complex add(double c, double d) + { + return new Complex(this.a + c, this.b + d); + } + + public Complex add(Complex obj) + { + return new Complex(this.a + obj.a, this.b + obj.b); + } + + public Complex subtract(double c, double d) + { + return new Complex(this.a - c, this.b - d); + } + public Complex subtract(Complex obj) + { + return new Complex(this.a - obj.a, this.b - obj.b); + } + + public Complex multiply(double c, double d) + { + double r = this.a * c - this.b * d; + double i = this.a * d + this.b * c; + return new Complex(r, i); + } + public Complex multiply(Complex obj) { + double r = this.a * obj.a - this.b * obj.b; + double i = this.a * obj.b + this.b * obj.a; + return new Complex(r, i); + } + + public Complex divide(double c, double d) + { + double denominator = (c * c) + (this.b * this.b); + double aNum = (this.a * c) + (this.b * this.b); + double iNum = (this.b * c) - (this.a * d); + double realResult = aNum / denominator; + double imaginaryResult = iNum / denominator; + return new Complex(realResult, imaginaryResult); + } + public Complex divide(Complex obj) + { + double denominator = (obj.a * obj.a) + (this.b * this.b); + double aNum = (this.a * obj.a) + (this.b * obj.b); + double iNum = (this.b * obj.a) - (this.a * obj.b); + double realResult = aNum / denominator; + double imaginaryResult = iNum / denominator; + return new Complex(realResult, imaginaryResult); + } + + + @Override + public String toString() + { + return a + " + " + b + "i"; + } + + public Complex clone() { + Complex obj = new Complex(this.a, this.b); + return obj; + } + + public double abs() { + return Math.abs(this.a + this.b); + } + + public double getRealPart() { + return this.a; + } + public double getImaginaryPart() { + return this.b; + } + +} diff --git a/Semester 2/Assignments/lab4_CalebFontenot/A.html b/Semester 2/Assignments/lab4_CalebFontenot/A.html new file mode 100644 index 0000000..c274ac9 --- /dev/null +++ b/Semester 2/Assignments/lab4_CalebFontenot/A.html @@ -0,0 +1,55 @@ + + + +A.java + + + + +
/home/caleb/ASDV-Java/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/A.java
+
+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ */
+package com.calebfontenot.lab5_calebfontenot;
+
+/**
+ *
+ * @author caleb
+ */
+public class A {
+    public A() { System.out.println("A constructor was called"); }
+    public A(String msg) {System.out.println(msg);}
+    public A(String msg1, String msg2) {
+        this (msg1 + "; " + msg2);
+        System.out.println("A 2-parm constructor was called");
+    }
+    public void instanceMethod1() { System.out.println("Instance method1 called from A"); }
+    public void instanceMethod2() { System.out.println("Instance method2 called from A"); }
+    public static void staticMethod() {System.out.println("Static method 2 called from A"); }
+}
+
+class B extends A {
+    public B() {System.out.println("B constructor called");}
+    public B(String msg)
+    {
+        System.out.println("B constructor called");
+        System.out.println(msg);
+    }
+    public void instanceMethod1() { System.out.println("Instance method1 called from B"); }
+    public void instanceMethod2() { System.out.println("Instance method2 called from B"); }
+    public static void staticMethod() {System.out.println("Static method 2 called from B"); }
+}
+
+
+ diff --git a/Semester 2/Assignments/lab4_CalebFontenot/Person.html b/Semester 2/Assignments/lab4_CalebFontenot/Person.html new file mode 100644 index 0000000..0f42ee4 --- /dev/null +++ b/Semester 2/Assignments/lab4_CalebFontenot/Person.html @@ -0,0 +1,221 @@ + + + +Person.java + + + + +
/home/caleb/ASDV-Java/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java
+
+/*
+ * 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.lab5_calebfontenot;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+
+/**
+ *
+ * @author caleb
+ */
+public class Person {
+    //name, addresss, phone number, and email addresss
+    
+    private String name;
+    private String address;
+    private String phoneNumber;
+    private String email;
+
+    public Person(String name, String address, String phoneNumber, String email)
+    {
+        this.name = name;
+        this.address = address;
+        this.phoneNumber = phoneNumber;
+        this.email = email;
+    }
+    
+    public String getEmailAddress() {return email;}
+    public void setEmailAddress(String email) {this.email = email;}
+    public String getPhoneNumber(){return phoneNumber;}
+    public void setPhoneNumber(String phoneNumber) {this.phoneNumber = phoneNumber;}
+    public String getAddress() {return address;}
+    public void setAddress(String address){ this.address = address;}
+    public String getName() {return name;}
+    public void setName(String name) {this.name = name;}
+
+    @Override
+    public String toString()
+    {
+        return "Person{" + "name=" + name + '}';
+    }
+    
+    public static void  checkArrayList() {
+        Integer[] arr = {3, 1, 2, 3, 6, 3, 4, 6, 3};
+        ArrayList<Integer> list =new ArrayList<Integer>(Arrays.asList(arr));
+        System.out.println(list);
+        Object[] arr3 = list.toArray();
+        for (int i = 0; i < 3; ++i) {
+            System.out.print(arr3[i] + " ");
+        }
+        System.out.println("max is " + Collections.max(list));
+        System.out.println();
+
+    }
+    
+    public static void ArrayListGeneric() {
+        ArrayList returnList = new ArrayList();
+        returnList.add(new Person("John Wayne", "123 Sunny Dr. Santa Barabara, 90611", "922-337-3231", "jw@gmail.com"));
+        returnList.add(new Date());
+        returnList.add(new String("Hello, I am a string object."));
+        returnList.add(new Employee("123", 1234567, new Date(), "Mary Poppins", "123 Blake Drive, Lafayette, LA, 70506", "337-123-4567", "mp@gmail.com"));
+        // Print objects in ArrayList
+        for (Object o: returnList) {
+            System.out.println(o);
+        }
+        
+    }
+    
+    public static ArrayList<Integer> removeDuplicate(ArrayList<Integer> list) {
+        //list.contains();
+        //list.remove();
+        System.out.println(list);
+        ArrayList<Integer> newList = new ArrayList<>();
+                for (int i = 0; i < list.size(); ++i) {
+                        if (!newList.contains(list.get(i))) {
+                            newList.add(list.get(i));
+                    }
+                }
+                return newList;
+    }
+    
+    public static void main(String[] args)
+    {
+        Integer[] arr = {3, 1, 2, 3, 6, 3, 4, 6, 3};
+        ArrayList<Integer> list2 =new ArrayList<>(Arrays.asList(arr));
+        System.out.println(removeDuplicate(list2));
+        ArrayListGeneric();
+        
+        ArrayList list = new ArrayList();
+        list.add(new Person("John Wayne", "123 Sunny Dr. Santa Barabara, 90611", "922-337-3231", "jw@gmail.com"));
+        list.add(new Date());
+        list.add("This is a string");
+        list.add(new String("This is another string"));
+        list.add(new Employee("123", 1234567, new Date(), "Mary Poppins", "123 Blake Drive, Lafayette, LA, 70506", "337-123-4567", "mp@gmail.com"));
+        for (int i = 0; i < list.size(); ++i) {
+            System.out.println(list.get(i));
+        }
+        
+    }
+}
+class Student extends Person {
+
+    private Status status;
+    public Status getStatus() {return status;}
+    public void setStatus(Status status) {this.status = status;}
+
+        public Student(Status status, String name, String address, String phoneNumber, String email)
+    {
+        super(name, address, phoneNumber, email);
+        this.status = status;
+    }
+    
+    @Override
+    public String toString() {return super.toString() + "Student{" + "Status=" + this.status +  '}';}
+}
+class Employee extends Person {
+    // office, salary, and data hired
+    private String office;
+    private double salary;
+    private Date dateHired;
+
+    public Employee(String office, double salary, Date dateHired, String name, String address, String phoneNumber, String email)
+    {
+        super(name, address, phoneNumber, email);
+        this.office = office;
+        this.salary = salary;
+        this.dateHired = dateHired;
+    }
+
+    
+    
+    public Date getDateHired() {return dateHired;}
+    public double getSalary() {return salary;}
+    public void setSalary(double salary) {this.salary = salary;}
+    public String getOffice() {return office;}
+    public void setOffice(String office) {this.office = office;}
+
+    @Override
+    public String toString() {return super.toString() + ", Employee{" + "Office=" + this.office + ", Salary=" + this.salary + ", dateHired=" +this.dateHired + '}';}
+}
+class Faculty extends Employee {
+    
+    private String officeHours;
+    private int rank;
+
+    public Faculty(String officeHours, int rank, String office, double salary, Date dateHired, String name, String address, String phoneNumber, String email)
+    {
+        super(office, salary, dateHired, name, address, phoneNumber, email);
+        this.officeHours = officeHours;
+        this.rank = rank;
+    }
+    
+    
+    
+    public int getRank(){return rank;}
+    public void setRank(int rank) {this.rank = rank;}
+    public String getOfficeHours() {return officeHours;}
+    public void setOfficeHours(String officeHours) {this.officeHours = officeHours;}
+    
+    @Override
+    public String toString() {return "Faculty{name="  + this.getName() + ", "  +"rank=" + rank + '}';}
+
+}
+class Staff extends Employee {
+    
+    private String title;
+
+    public Staff(String title, String office, double salary, Date dateHired, String name, String address, String phoneNumber, String email)
+    {
+        super(office, salary, dateHired, name, address, phoneNumber, email);
+        this.title = title;
+    }
+    
+    
+    
+    public String getTitle() {return title;}
+    public void setTitle(String title) {this.title = title;}
+
+      @Override
+    public String toString() {return "Staff{name="  + this.getName() + ", "  +"title=" + title + '}';}
+}
+class Status  {
+    
+    final private String status;
+    public Status(String status) { this.status = status;}
+    public String getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {return "Status{" + "status=" + status + '}';}
+
+}
+
+ diff --git a/Semester 2/Assignments/lab5_CalebFontenot/lab4.pdf b/Semester 2/Assignments/lab4_CalebFontenot/lab4.pdf similarity index 100% rename from Semester 2/Assignments/lab5_CalebFontenot/lab4.pdf rename to Semester 2/Assignments/lab4_CalebFontenot/lab4.pdf diff --git a/Semester 2/Assignments/lab4_CalebFontenot/lab5_CalebFontenot.html b/Semester 2/Assignments/lab4_CalebFontenot/lab5_CalebFontenot.html new file mode 100644 index 0000000..1989ed6 --- /dev/null +++ b/Semester 2/Assignments/lab4_CalebFontenot/lab5_CalebFontenot.html @@ -0,0 +1,62 @@ + + + +lab5_CalebFontenot.java + + + + +
/home/caleb/ASDV-Java/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/lab5_CalebFontenot.java
+
+/*
+ * 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.lab5_calebfontenot;
+
+/**
+ *
+ * @author caleb
+ */
+public class lab5_CalebFontenot {
+        public static void main(String[] args)
+    {
+        //B b = new B("hi");
+        //A a = new A("msg1: The 2-parm constructor of A uses \"this\"",
+        //                    "msg2: to call the 1-parm  constructor of A ");
+        //A a1 = new A();
+        //B b1 = new B();
+        //a.instanceMethod1();
+        //a.instanceMethod2();
+        //A.staticMethod();
+        
+        //b.instanceMethod1();
+        //b.instanceMethod2();
+        //B.staticMethod();
+        
+        //A a3 = new B();
+        //a3.instanceMethod1();
+        
+        //testPolymorphism(a1);
+        //testPolymorphism(b1);
+        
+        B b2 = (B) new A();
+    }
+ public static void testPolymorphism(A a) {
+     a.instanceMethod1();
+ }       
+}
+
+
+ diff --git a/Semester 2/Assignments/lab4_CalebFontenot/pom.xml b/Semester 2/Assignments/lab4_CalebFontenot/pom.xml index dcf8920..2d81909 100644 --- a/Semester 2/Assignments/lab4_CalebFontenot/pom.xml +++ b/Semester 2/Assignments/lab4_CalebFontenot/pom.xml @@ -2,13 +2,14 @@ 4.0.0 com.calebfontenot - lab4_CalebFontenot + lab5_CalebFontenot 1.0-SNAPSHOT jar UTF-8 1.8 1.8 - com.calebfontenot.lab4_calebfontenot.Lab4_CalebFontenot + com.calebfontenot.lab5_calebfontenot.Lab5_CalebFontenot + lab4_CalebFontenot \ No newline at end of file diff --git a/Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/A.java b/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/A.java similarity index 100% rename from Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/A.java rename to Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/A.java diff --git a/Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java b/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java similarity index 87% rename from Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java rename to Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java index 4cb8039..11ce3dc 100644 --- a/Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java +++ b/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/Person.java @@ -57,7 +57,18 @@ public class Person { } - public static void ArrayListGeneric() + public static void ArrayListGeneric() { + ArrayList returnList = new ArrayList(); + returnList.add(new Person("John Wayne", "123 Sunny Dr. Santa Barabara, 90611", "922-337-3231", "jw@gmail.com")); + returnList.add(new Date()); + returnList.add(new String("Hello, I am a string object.")); + returnList.add(new Employee("123", 1234567, new Date(), "Mary Poppins", "123 Blake Drive, Lafayette, LA, 70506", "337-123-4567", "mp@gmail.com")); + // Print objects in ArrayList + for (Object o: returnList) { + System.out.println(o); + } + + } public static ArrayList removeDuplicate(ArrayList list) { //list.contains(); @@ -77,6 +88,7 @@ public class Person { Integer[] arr = {3, 1, 2, 3, 6, 3, 4, 6, 3}; ArrayList list2 =new ArrayList<>(Arrays.asList(arr)); System.out.println(removeDuplicate(list2)); + ArrayListGeneric(); ArrayList list = new ArrayList(); list.add(new Person("John Wayne", "123 Sunny Dr. Santa Barabara, 90611", "922-337-3231", "jw@gmail.com")); @@ -103,7 +115,7 @@ class Student extends Person { } @Override - public String toString() {return super.toString() + "Student{" + '}';} + public String toString() {return super.toString() + "Student{" + "Status=" + this.status + '}';} } class Employee extends Person { // office, salary, and data hired @@ -128,7 +140,7 @@ class Employee extends Person { public void setOffice(String office) {this.office = office;} @Override - public String toString() {return super.toString() + "Employee{" + '}';} + public String toString() {return super.toString() + ", Employee{" + "Office=" + this.office + ", Salary=" + this.salary + ", dateHired=" +this.dateHired + '}';} } class Faculty extends Employee { diff --git a/Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/lab5_CalebFontenot.java b/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/lab5_CalebFontenot.java similarity index 100% rename from Semester 2/Assignments/lab5_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/lab5_CalebFontenot.java rename to Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab5_calebfontenot/lab5_CalebFontenot.java diff --git a/Semester 2/Assignments/lab5_CalebFontenot/pom.xml b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/pom.xml similarity index 81% rename from Semester 2/Assignments/lab5_CalebFontenot/pom.xml rename to Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/pom.xml index c82780f..dcf8920 100644 --- a/Semester 2/Assignments/lab5_CalebFontenot/pom.xml +++ b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/pom.xml @@ -2,13 +2,13 @@ 4.0.0 com.calebfontenot - lab5_CalebFontenot + lab4_CalebFontenot 1.0-SNAPSHOT jar UTF-8 1.8 1.8 - com.calebfontenot.lab5_calebfontenot.Lab5_CalebFontenot + com.calebfontenot.lab4_calebfontenot.Lab4_CalebFontenot \ No newline at end of file diff --git a/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/Circle.java b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/Circle.java similarity index 100% rename from Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/Circle.java rename to Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/Circle.java diff --git a/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/GeometricObject.java b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/GeometricObject.java similarity index 100% rename from Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/GeometricObject.java rename to Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/GeometricObject.java diff --git a/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/Lab4_CalebFontenot.java b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/Lab4_CalebFontenot.java similarity index 100% rename from Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/Lab4_CalebFontenot.java rename to Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/Lab4_CalebFontenot.java diff --git a/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/Rectangle.java b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/Rectangle.java similarity index 100% rename from Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/Rectangle.java rename to Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/Rectangle.java diff --git a/Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/TestCircleRectangle.java b/Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/TestCircleRectangle.java similarity index 100% rename from Semester 2/Assignments/lab4_CalebFontenot/src/main/java/com/calebfontenot/lab4_calebfontenot/TestCircleRectangle.java rename to Semester 2/Assignments/lab4_CalebFontenot_oldGoshDarnitMarkouREEE/src/main/java/com/calebfontenot/lab4_calebfontenot/TestCircleRectangle.java diff --git a/Semester 2/ZIPs/lab4_CalebFontenot.zip b/Semester 2/ZIPs/lab4_CalebFontenot.zip new file mode 100644 index 0000000..c934687 Binary files /dev/null and b/Semester 2/ZIPs/lab4_CalebFontenot.zip differ