# HG changeset patch # User tatsuki # Date 1427687907 -32400 # Node ID 3de906fb90d1dc3967200a9a5134d105a6edb3ca # Parent 090acf24fd3df7041d522cb6a48e7bc2e3c4c259 delete get change getLoop -> get diff -r 090acf24fd3d -r 3de906fb90d1 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/TreeMap/Node.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/TreeMap/Node.java Sun Mar 29 23:21:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/TreeMap/Node.java Mon Mar 30 12:58:27 2015 +0900 @@ -31,22 +31,6 @@ public Optional get(Comparable key) { - int result = key.compareTo(getKey()); - - if (result > 0) - return right().get(key); - - else if (result < 0) - return left().get(key); - - else if (result == 0) - return Optional.ofNullable(getValue()); - - return Optional.ofNullable(null); - } - - public Optional getLoop(Comparable key) { - Node cur = this; while (cur.exitNode()) { diff -r 090acf24fd3d -r 3de906fb90d1 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/TreeMap/TreeMap.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/TreeMap/TreeMap.java Sun Mar 29 23:21:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/TreeMap/TreeMap.java Mon Mar 30 12:58:27 2015 +0900 @@ -14,7 +14,7 @@ int size; public TreeMap() { - this.root = new EmptyNode<>(); + this.root = new EmptyNode(); this.size = 0; } @@ -32,10 +32,6 @@ return root.get((Comparable) key); } - public Optional getLoop(K key) { - return root.getLoop((Comparable) key); - } - public TreeMap put(K key, V value) { if (key == null || value == null) // null check diff -r 090acf24fd3d -r 3de906fb90d1 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/test/TreeMapTest.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/test/TreeMapTest.java Sun Mar 29 23:21:19 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/test/TreeMapTest.java Mon Mar 30 12:58:27 2015 +0900 @@ -22,7 +22,7 @@ for (int count = 100; count > -10; count--) { - Optional op = map.getLoop(count); + Optional op = map.get(count); if (op.isPresent()) System.out.println(op.get()); }