diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..540cdbc --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +unit-1-bootcamp-assessment \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..a852314 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..d821048 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/jdk1_7_0_75.xml b/.idea/libraries/jdk1_7_0_75.xml new file mode 100644 index 0000000..8614d03 --- /dev/null +++ b/.idea/libraries/jdk1_7_0_75.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jdk1_7_0_751.xml b/.idea/libraries/jdk1_7_0_751.xml new file mode 100644 index 0000000..4766e86 --- /dev/null +++ b/.idea/libraries/jdk1_7_0_751.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml new file mode 100644 index 0000000..85d6a10 --- /dev/null +++ b/.idea/libraries/lib.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..da097ba --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + 1.7 + + + + + + + + jdk1.7.0_75 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8928d91 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..cc39bf5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,667 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1432856430832 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.7 + + + + + + + + unit-1-bootcamp-assessment + + + + + + + + 1.7 + + + + + + + + jdk1.7.0_75 + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index c02997c..c94c07b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Test Start time: Thu May 28, 7:00pm EST -My End time: `` +My End time: 9pm Test End time: Fri May 29, 10:00pm EST diff --git a/out/production/unit-1-bootcamp-assessment/Exercises$Child.class b/out/production/unit-1-bootcamp-assessment/Exercises$Child.class new file mode 100644 index 0000000..2df8147 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Exercises$Child.class differ diff --git a/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class b/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class new file mode 100644 index 0000000..0a403bd Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class differ diff --git a/out/production/unit-1-bootcamp-assessment/Exercises.class b/out/production/unit-1-bootcamp-assessment/Exercises.class new file mode 100644 index 0000000..1b5bc7e Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Exercises.class differ diff --git a/out/production/unit-1-bootcamp-assessment/MyNode.class b/out/production/unit-1-bootcamp-assessment/MyNode.class new file mode 100644 index 0000000..df6a76f Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/MyNode.class differ diff --git a/out/production/unit-1-bootcamp-assessment/MyObject.class b/out/production/unit-1-bootcamp-assessment/MyObject.class new file mode 100644 index 0000000..719b938 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/MyObject.class differ diff --git a/out/production/unit-1-bootcamp-assessment/MyObjectNode.class b/out/production/unit-1-bootcamp-assessment/MyObjectNode.class new file mode 100644 index 0000000..ae1e406 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/MyObjectNode.class differ diff --git a/out/production/unit-1-bootcamp-assessment/Tests.class b/out/production/unit-1-bootcamp-assessment/Tests.class new file mode 100644 index 0000000..a94d975 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Tests.class differ diff --git a/src/Exercises.java b/src/Exercises.java index ac85d45..35bf6dc 100644 --- a/src/Exercises.java +++ b/src/Exercises.java @@ -1,11 +1,20 @@ public class Exercises { static class Parent { - public String doStuff() { return ""; } + + public String doStuff() { + return "parent"; + } } + static class Child extends Parent { - public String doStuff() { return ""; } - public String doStuff(String s) { return ""; } + public String doStuff() { + return "child"; + } + + public String doStuff(String s) { + return "Howdy"; + } } diff --git a/src/MyNode.java b/src/MyNode.java index 54f3213..aa39b4a 100644 --- a/src/MyNode.java +++ b/src/MyNode.java @@ -1,10 +1,12 @@ +import java.util.ArrayList; + /** * Created by amyquispe on 5/28/15. */ public abstract class MyNode { - private MyNode left; - private MyNode right; - private T data; + protected MyNode left; + protected MyNode right; + protected T data; public abstract MyNode getLeft(); @@ -13,6 +15,7 @@ public abstract class MyNode { public abstract T getData(); public abstract void insert(MyNode newNode); + public boolean contains(T someData){ if(getData()==null && someData == null){ return false; @@ -23,6 +26,29 @@ public boolean contains(T someData){ boolean left = getLeft()!=null ? getLeft().contains(someData) : false; boolean right = getRight()!=null ? getRight().contains(someData) : false; + + +// if ( getRight()!= null) { +// right = getRight().contains(someData); +// } +// else { +// right = false; +// } + + + return left || right; } + + public static void main(String[] args) + { + ArrayList l = new ArrayList(); + l.add(1); + l.add("hello"); + l.add(0.0f); + + int value = (Integer) l.get(0); + String value2 = (String) l.get(1); + System.out.println(value + " " + value2 ); + } } diff --git a/src/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..f390856 --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,33 @@ +/** + * Created by July on 5/28/15. + */ +public class MyObject +{ + private String name; + private int age; + + public MyObject(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public int getAge() + { + return age; + } + + public void setAge(int age) + { + this.age = age; + } +} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java new file mode 100644 index 0000000..c995952 --- /dev/null +++ b/src/MyObjectNode.java @@ -0,0 +1,55 @@ +import java.util.Random; + +/** + * Created by July on 5/28/15. + */ +public class MyObjectNode extends MyNode +{ + private int any; + + public MyObjectNode() { + } + + public void setLeft(MyNode left) { + this.left = left; +} + + public void setRight(MyNode right) { + this.right = right; + } + + public void setData(Object data) { + this.data = data; + } + + @Override + public MyNode getLeft() + { + return left; + } + + @Override + public MyNode getRight() + { + return right; + } + + @Override + public Object getData() + { + return data; + } + + @Override + public void insert(MyNode newNode) + { +// Random r = new Random(0); +// if (r.nextBoolean()) + if (this.getLeft() == null){ + this.setLeft(newNode); + } + else { + this.getLeft().insert(newNode); + } + } +} diff --git a/unit-1-bootcamp-assessment.iml b/unit-1-bootcamp-assessment.iml new file mode 100644 index 0000000..fb8e866 --- /dev/null +++ b/unit-1-bootcamp-assessment.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file