Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

힙 ADT 정의 및 Impl 붙은 클래스 명 전부 수정 #32

Merged
merged 2 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions yoonexample/src/main/java/heap/SimpleHeap.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package heap;

/**
* 우선순위를 기준으로 하는 Heap 자료구조
*
* @param <E> 타입 파라미터
*/
public interface SimpleHeap<E> {

/**
* 해당 Heap이 비어있는지 여부를 반환합니다.
*
* @return 해당 Heap이 비어있으면 true, 아니라면 false
*/
boolean isEmpty();

/**
* 해당 Heap에 데이터를 저장합니다.
*
* @param data 저장할 데이터
* @param priority 저장할 데이터의 우선순위(작을 수록 높은 우선순위)
*/
void insert(E data, int priority);

/**
* 해당 Heap의 최우선순위 데이터를 제거합니다.
*
* @return 힙에 저장되어 있던 최우선순위 데이터
*/
E delete();
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tree.binarytree;

public class BinaryTreeNodeImpl<E> implements BinaryTreeNode<E> {
public class LinkedBinaryTreeNode<E> implements BinaryTreeNode<E> {

private final E data;
private BinaryTreeNode<E> left;
private BinaryTreeNode<E> right;

public BinaryTreeNodeImpl(E data) {
public LinkedBinaryTreeNode(E data) {
this.data = data;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tree.binarytree;

public class TraversableBinaryTreeNodeImpl<E> implements TraversableBinaryTreeNode<E> {
public class LinkedTraversableBinaryTreeNode<E> implements TraversableBinaryTreeNode<E> {

private final E data;
private TraversableBinaryTreeNode<E> left;
private TraversableBinaryTreeNode<E> right;

public TraversableBinaryTreeNodeImpl(E data) {
public LinkedTraversableBinaryTreeNode(E data) {
this.data = data;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

import stack.ListStack;
import stack.Stack;
import tree.binarytree.LinkedTraversableBinaryTreeNode;
import tree.binarytree.TraversableBinaryTreeNode;
import tree.binarytree.TraversableBinaryTreeNodeImpl;

public class ExpressionTreeImpl implements ExpressionTree {
public class LinkedExpressionTree implements ExpressionTree {

private TraversableBinaryTreeNode<Character> root;

public ExpressionTreeImpl(char[] postfixExpression) {
public LinkedExpressionTree(char[] postfixExpression) {
Stack<TraversableBinaryTreeNode<Character>> stack = new ListStack<>();

for (char expr : postfixExpression) {
TraversableBinaryTreeNode<Character> node = new TraversableBinaryTreeNodeImpl<>(expr);
TraversableBinaryTreeNode<Character> node = new LinkedTraversableBinaryTreeNode<>(expr);
if (!Character.isDigit(expr)) { // 숫자가 아니라면, 연산자임
node.setRightSubTree(stack.pop());
node.setLeftSubTree(stack.pop());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class BinaryTreeNodeTest {
@Test
@DisplayName("이진_트리_생성_및_초기화_테스트")
void 이진_트리_생성_및_초기화_테스트() {
BinaryTreeNode<Integer> bt = new BinaryTreeNodeImpl<>(1);
BinaryTreeNode<Integer> bt = new LinkedBinaryTreeNode<>(1);

assertThat(bt).isNotNull();
assertThat(bt.getData()).isEqualTo(1);
Expand All @@ -21,10 +21,10 @@ class BinaryTreeNodeTest {
@Test
@DisplayName("이진_트리_저장_및_출력_테스트")
void 이진_트리_저장_및_출력_테스트() {
BinaryTreeNode<Integer> bt1 = new BinaryTreeNodeImpl<>(1);
BinaryTreeNode<Integer> bt2 = new BinaryTreeNodeImpl<>(2);
BinaryTreeNode<Integer> bt3 = new BinaryTreeNodeImpl<>(3);
BinaryTreeNode<Integer> bt4 = new BinaryTreeNodeImpl<>(4);
BinaryTreeNode<Integer> bt1 = new LinkedBinaryTreeNode<>(1);
BinaryTreeNode<Integer> bt2 = new LinkedBinaryTreeNode<>(2);
BinaryTreeNode<Integer> bt3 = new LinkedBinaryTreeNode<>(3);
BinaryTreeNode<Integer> bt4 = new LinkedBinaryTreeNode<>(4);

bt1.setLeftSubTree(bt2);
bt1.setRightSubTree(bt3);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class TraversableBinaryTreeNodeTest {
@Test
@DisplayName("순회_가능한_이진_트리_생성_및_초기화_테스트")
void 순회_가능한_이진_트리_생성_및_초기화_테스트() {
TraversableBinaryTreeNode<Integer> bt = new TraversableBinaryTreeNodeImpl<>(1);
TraversableBinaryTreeNode<Integer> bt = new LinkedTraversableBinaryTreeNode<>(1);

assertThat(bt).isNotNull();
assertThat(bt.getData()).isEqualTo(1);
Expand All @@ -21,10 +21,10 @@ class TraversableBinaryTreeNodeTest {
@Test
@DisplayName("순회_가능한_이진_트리_저장_및_출력_테스트")
void 순회_가능한_이진_트리_저장_및_출력_테스트() {
TraversableBinaryTreeNode<Integer> bt1 = new TraversableBinaryTreeNodeImpl<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new TraversableBinaryTreeNodeImpl<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new TraversableBinaryTreeNodeImpl<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new TraversableBinaryTreeNodeImpl<>(4);
TraversableBinaryTreeNode<Integer> bt1 = new LinkedTraversableBinaryTreeNode<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new LinkedTraversableBinaryTreeNode<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new LinkedTraversableBinaryTreeNode<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new LinkedTraversableBinaryTreeNode<>(4);

bt1.setLeftSubTree(bt2);
bt1.setRightSubTree(bt3);
Expand All @@ -47,10 +47,10 @@ class TraversableBinaryTreeNodeTest {
@Test
@DisplayName("순회_가능한_이진_트리_전위_순회_테스트")
void 순회_가능한_이진_트리_전위_순회_테스트() {
TraversableBinaryTreeNode<Integer> bt1 = new TraversableBinaryTreeNodeImpl<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new TraversableBinaryTreeNodeImpl<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new TraversableBinaryTreeNodeImpl<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new TraversableBinaryTreeNodeImpl<>(4);
TraversableBinaryTreeNode<Integer> bt1 = new LinkedTraversableBinaryTreeNode<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new LinkedTraversableBinaryTreeNode<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new LinkedTraversableBinaryTreeNode<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new LinkedTraversableBinaryTreeNode<>(4);

bt1.setLeftSubTree(bt2);
bt1.setRightSubTree(bt3);
Expand All @@ -66,10 +66,10 @@ class TraversableBinaryTreeNodeTest {
@Test
@DisplayName("순회_가능한_이진_트리_중위_순회_테스트")
void 순회_가능한_이진_트리_중위_순회_테스트() {
TraversableBinaryTreeNode<Integer> bt1 = new TraversableBinaryTreeNodeImpl<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new TraversableBinaryTreeNodeImpl<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new TraversableBinaryTreeNodeImpl<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new TraversableBinaryTreeNodeImpl<>(4);
TraversableBinaryTreeNode<Integer> bt1 = new LinkedTraversableBinaryTreeNode<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new LinkedTraversableBinaryTreeNode<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new LinkedTraversableBinaryTreeNode<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new LinkedTraversableBinaryTreeNode<>(4);

bt1.setLeftSubTree(bt2);
bt1.setRightSubTree(bt3);
Expand All @@ -85,10 +85,10 @@ class TraversableBinaryTreeNodeTest {
@Test
@DisplayName("순회_가능한_이진_트리_후위_순회_테스트")
void 순회_가능한_이진_트리_후위_순회_테스트() {
TraversableBinaryTreeNode<Integer> bt1 = new TraversableBinaryTreeNodeImpl<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new TraversableBinaryTreeNodeImpl<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new TraversableBinaryTreeNodeImpl<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new TraversableBinaryTreeNodeImpl<>(4);
TraversableBinaryTreeNode<Integer> bt1 = new LinkedTraversableBinaryTreeNode<>(1);
TraversableBinaryTreeNode<Integer> bt2 = new LinkedTraversableBinaryTreeNode<>(2);
TraversableBinaryTreeNode<Integer> bt3 = new LinkedTraversableBinaryTreeNode<>(3);
TraversableBinaryTreeNode<Integer> bt4 = new LinkedTraversableBinaryTreeNode<>(4);

bt1.setLeftSubTree(bt2);
bt1.setRightSubTree(bt3);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ void setUp() {
String infixExpression = "1 + 2";
char[] postfixExpression = infixToPostfix.convertInputToPostfix(infixExpression);

ExpressionTree expressionTree = new ExpressionTreeImpl(postfixExpression);
ExpressionTree expressionTree = new LinkedExpressionTree(postfixExpression);
assertThat(expressionTree.evaluateTree()).isEqualTo(3);

StringBuilder sb = new StringBuilder();
Expand All @@ -44,7 +44,7 @@ void setUp() {
String infixExpression = "1 + 2 * 7";
char[] postfixExpression = infixToPostfix.convertInputToPostfix(infixExpression);

ExpressionTree expressionTree = new ExpressionTreeImpl(postfixExpression);
ExpressionTree expressionTree = new LinkedExpressionTree(postfixExpression);
assertThat(expressionTree.evaluateTree()).isEqualTo(15);

StringBuilder sb = new StringBuilder();
Expand Down