💡 Documenting source code.

crossoverJie · crossoverJie · commit 5a32644f4a5f · 2018-02-10T00:11:18.000+08:00
diff --git a/src/main/java/com/crossoverjie/algorithm/TwoStackQueue.java b/src/main/java/com/crossoverjie/algorithm/TwoStackQueue.java
@@ -9,19 +9,47 @@
  *         Date: 09/02/2018 23:51
  * @since JDK 1.8
  */
-public class TwoStackQueue {
+public class TwoStackQueue<T> {
 
-    private Stack input = new Stack() ;
-    private Stack out = new Stack() ;
+    /**
+     * 写入的栈
+     */
+    private Stack<T> input = new Stack() ;
+
+    /**
+     * 移除队列所出的栈
+     */
+    private Stack<T> out = new Stack() ;
 
 
     /**
      * 写入队列
-     * @param object
+     * @param t
      */
-    private void appendTail(Object object){
-        input.push(object) ;
+    public void appendTail(T t){
+        input.push(t) ;
     }
 
+    /**
+     * 删除队列头结点 并返回删除数据
+     * @return
+     */
+    public T deleteHead(){
+
+        //是空的 需要将 input 出栈写入 out
+        if (out.isEmpty()){
+            while (!input.isEmpty()){
+                out.push(input.pop()) ;
+            }
+        }
+
+        //不为空时直接移除出栈就表示移除了头结点
+        return out.pop() ;
+    }
+
+
+    public int getSize(){
+        return input.size() + out.size() ;
+    }
 
 }
diff --git a/src/test/java/com/crossoverjie/actual/AbstractMapTest.java b/src/test/java/com/crossoverjie/actual/AbstractMapTest.java
@@ -15,10 +15,10 @@ public void test(){
         map.put(2,2) ;
 
         Object o = map.get(1);
-        LOGGER.info("size={}",map.size());
+        LOGGER.info("getSize={}",map.size());
 
         map.remove(1) ;
-        LOGGER.info("size"+map.size());
+        LOGGER.info("getSize"+map.size());
     }
 
     public static void main(String[] args) {
@@ -27,10 +27,10 @@ public static void main(String[] args) {
         map.put(2,2) ;
 
         Object o = map.get(1);
-        LOGGER.info("size={}",map.size());
+        LOGGER.info("getSize={}",map.size());
 
         map.remove(1) ;
         map.remove(2) ;
-        LOGGER.info("size"+map.size());
+        LOGGER.info("getSize"+map.size());
     }
 }
diff --git a/src/test/java/com/crossoverjie/algorithm/TwoStackQueueTest.java b/src/test/java/com/crossoverjie/algorithm/TwoStackQueueTest.java
@@ -0,0 +1,36 @@
+package com.crossoverjie.algorithm;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TwoStackQueueTest {
+    private final static Logger LOGGER = LoggerFactory.getLogger(TwoStackQueueTest.class);
+    @Test
+    public void queue(){
+        TwoStackQueue<String> twoStackQueue = new TwoStackQueue<String>() ;
+        twoStackQueue.appendTail("1") ;
+        twoStackQueue.appendTail("2") ;
+        twoStackQueue.appendTail("3") ;
+        twoStackQueue.appendTail("4") ;
+        twoStackQueue.appendTail("5") ;
+
+
+        int size = twoStackQueue.getSize();
+
+        for (int i = 0; i< size ; i++){
+            LOGGER.info(twoStackQueue.deleteHead());
+        }
+
+        LOGGER.info("========第二次添加=========");
+
+        twoStackQueue.appendTail("6") ;
+
+        size = twoStackQueue.getSize();
+
+        for (int i = 0; i< size ; i++){
+            LOGGER.info(twoStackQueue.deleteHead());
+        }
+    }
+
+}
