Merge pull request #9 from DonaldY/master

合并组长的代码0527
onlyliuxin · May 27, 2017 · fb27900 · fb27900
2 parents 14b3384 + 51162c6
commit fb27900
Show file tree

Hide file tree

Showing 194 changed files with 4,039 additions and 981 deletions.
diff --git a/group24/1148285693/learning2017/.gitignore b/group24/1148285693/learning2017/.gitignore
@@ -34,6 +34,3 @@ logs
 *.bak
 .directory
 .DS_Store
-
-
-Test.java
diff --git a/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/AppUtils.java b/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/AppUtils.java
@@ -1,12 +1,13 @@
 package me.lzb.common.utils;
 
 /**
- * Created by lzbfe on 2017/4/29.
+ * @author LZB
  */
 public class AppUtils {
 
     /**
      * 获取一个数的位数
+     *
      * @param i
      * @return
      */

diff --git a/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/ByteUtils.java b/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/ByteUtils.java
@@ -1,25 +1,25 @@
 package me.lzb.common.utils;
 
 /**
- * Created by LZB on 2017/4/14.
+ * @author LZB
  */
 public class ByteUtils {
 
-    public static String byteToHexString(byte[] codes ){
+    public static String byteToHexString(byte[] codes) {
         StringBuffer buffer = new StringBuffer();
-        for(int i=0;i<codes.length;i++){
+        for (int i = 0; i < codes.length; i++) {
             byte b = codes[i];
             int value = b & 0xFF;
             String strHex = Integer.toHexString(value);
-            if(strHex.length()< 2){
+            if (strHex.length() < 2) {
                 strHex = "0" + strHex;
             }
             buffer.append(strHex);
         }
         return buffer.toString();
     }
 
-    public static int byteToInt(byte[] codes){
+    public static int byteToInt(byte[] codes) {
         String s1 = byteToHexString(codes);
         return Integer.valueOf(s1, 16).intValue();
     }

diff --git a/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/FileUtils.java b/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/FileUtils.java
@@ -3,7 +3,7 @@
 import java.io.*;
 
 /**
- * Created by LZB on 2017/4/4.
+ * @author LZB
  */
 public class FileUtils {
 
@@ -26,12 +26,13 @@ public static boolean isFileExist(String f) {
 
     /**
      * 读取文件为二进制数组
+     *
      * @param clzFileName 文件路径
      * @return 数组
      * @throws IOException
      */
     public static byte[] readByteCodes(String clzFileName) throws IOException {
-        if(!isFileExist(clzFileName)){
+        if (!isFileExist(clzFileName)) {
             return null;
         }
 

diff --git a/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/StringUtils.java b/group24/1148285693/learning2017/common/src/main/java/me/lzb/common/utils/StringUtils.java
@@ -1,7 +1,7 @@
 package me.lzb.common.utils;
 
 /**
- * Created by LZB on 2017/4/4.
+ * @author LZB
  */
 public class StringUtils extends org.apache.commons.lang3.StringUtils {
 

diff --git a/group24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/LRUPageFrame.java b/group24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/LRUPageFrame.java
@@ -2,58 +2,58 @@
 
 /**
  * 用双向链表实现LRU算法
- * @author lzb
  *
+ * @author lzb
  */
 public class LRUPageFrame {
 
-	private static class Node {
+    private static class Node {
 
-		Node prev;
-		Node next;
-		int pageNum;
+        Node prev;
+        Node next;
+        int pageNum;
 
-		Node(Node prev, Node next, int pageNum) {
-		    this.prev = prev;
-		    this.next = next;
+        Node(Node prev, Node next, int pageNum) {
+            this.prev = prev;
+            this.next = next;
             this.pageNum = pageNum;
-		}
-	}
+        }
+    }
 
-	private int capacity;
+    private int capacity;
 
 
-	private Node first;// 链表头
-	private Node last;// 链表尾
+    private Node first;// 链表头
+    private Node last;// 链表尾
 
 
-	public LRUPageFrame(int capacity) {
-        if(capacity < 1){
+    public LRUPageFrame(int capacity) {
+        if (capacity < 1) {
 //            throw new Exception("capacity boom");
         }
-		this.capacity = capacity;
-
-	}
-
-	/**
-	 * 获取缓存中对象
-	 *
-	 * @param pageNum
-	 * @return
-	 */
-	public void access(int pageNum) {
-        if(capacity == 1){
-	        first = last = new Node(null, null, pageNum);
+        this.capacity = capacity;
+
+    }
+
+    /**
+     * 获取缓存中对象
+     *
+     * @param pageNum
+     * @return
+     */
+    public void access(int pageNum) {
+        if (capacity == 1) {
+            first = last = new Node(null, null, pageNum);
             return;
         }
 
 
-        if(first == null){
+        if (first == null) {
             first = last = new Node(null, null, pageNum);
             return;
         }
 
-        if(first.pageNum == pageNum){
+        if (first.pageNum == pageNum) {
             return;
         }
 
@@ -62,12 +62,12 @@ public void access(int pageNum) {
         for (int i = 0; i < capacity; i++) {
             size = size + 1;
             //如果发现一样的,把这个挪到最前面
-            if(tmp.pageNum == pageNum){
+            if (tmp.pageNum == pageNum) {
                 moveToFirst(tmp);
                 return;
             }
             //链表已经循环结束，但是个数还没满，更新last
-            if(tmp.next == null){
+            if (tmp.next == null) {
                 last = tmp;
                 break;
             }
@@ -80,16 +80,16 @@ public void access(int pageNum) {
         addAsFirst(f);
 
         //已经放满，更新last
-        if(size >= capacity){
+        if (size >= capacity) {
             removeLastOne();
         }
 
-	}
+    }
 
     /**
      * 删除最后一个节点
      */
-	private void removeLastOne(){
+    private void removeLastOne() {
         last = last.prev;
         //使GC ROOT 不可达
         last.next.prev = null;
@@ -98,17 +98,18 @@ private void removeLastOne(){
 
     /**
      * 把某节点移动到最顶部
+     *
      * @param tmp 在链表中的任意节点
      */
-	private void moveToFirst(Node tmp){
-	    if(tmp == first){
-	        return;
+    private void moveToFirst(Node tmp) {
+        if (tmp == first) {
+            return;
         }
 
-        if (tmp.next != null){
+        if (tmp.next != null) {
             tmp.next.prev = tmp.prev;
             tmp.prev.next = tmp.next;
-        }else {
+        } else {
             tmp.prev.next = null;
             //当这个节点是last的时候，更新last
             last = tmp.prev;
@@ -123,47 +124,49 @@ private void moveToFirst(Node tmp){
 
     /**
      * 在顶部增加一个节点
+     *
      * @param node node
      */
-	private void addAsFirst(Node node){
+    private void addAsFirst(Node node) {
         first.prev = node;
         first = node;
     }
 
 
-
     /**
      * ASC
+     *
      * @return
      */
-	public String toString(){
-		StringBuilder buffer = new StringBuilder();
-		Node node = first;
-		while(node != null){
-			buffer.append(node.pageNum);
+    public String toString() {
+        StringBuilder buffer = new StringBuilder();
+        Node node = first;
+        while (node != null) {
+            buffer.append(node.pageNum);
 
-			node = node.next;
-			if(node != null){
-				buffer.append(",");
-			}
-		}
-		return buffer.toString();
-	}
+            node = node.next;
+            if (node != null) {
+                buffer.append(",");
+            }
+        }
+        return buffer.toString();
+    }
 
 
     /**
      * DESC
+     *
      * @return
      */
-    public String toStringDESC(){
+    public String toStringDESC() {
 
         StringBuilder buffer = new StringBuilder();
         Node node = last;
-        while(node != null){
+        while (node != null) {
             buffer.append(node.pageNum);
 
             node = node.prev;
-            if(node != null){
+            if (node != null) {
                 buffer.append(",");
             }
         }

diff --git a/group24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/CalUtil.java b/group24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/CalUtil.java
@@ -7,7 +7,7 @@
 import java.util.Stack;
 
 /**
- * Created by LZB on 2017/4/20.
+ * @author LZB
  */
 public class CalUtil {
 

diff --git a/...p24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/InfixExpr.java b/...p24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/InfixExpr.java
@@ -5,7 +5,8 @@
 
 /**
  * 中序表达式
- * Created by LZB on 2017/4/15.
+ *
+ * @author LZB
  */
 public class InfixExpr {
 

diff --git a/...148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/InfixToPostfix.java b/...148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/InfixToPostfix.java
@@ -5,7 +5,8 @@
 
 /**
  * 中序转后序
- * Created by LZB on 2017/4/20.
+ *
+ * @author LZB
  */
 public class InfixToPostfix {
 

diff --git a/group24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/Node.java b/group24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/Node.java
@@ -1,7 +1,7 @@
 package me.lzb.basic.expr;
 
 /**
- * Created by LZB on 2017/4/20.
+ * @author LZB
  */
 public class Node {
     float number;
@@ -22,7 +22,7 @@ public boolean isLevel3() {
         return calLevel == 3;
     }
 
-    public boolean isNumber(){
+    public boolean isNumber() {
         return calLevel == -1;
     }
 }
diff --git a/...4/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/PostfixExpr.java b/...4/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/PostfixExpr.java
@@ -6,7 +6,8 @@
 
 /**
  * 后缀表达式
- * Created by LZB on 2017/4/20.
+ *
+ * @author LZB
  */
 public class PostfixExpr {
 

diff --git a/...24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/PrefixExpr.java b/...24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/expr/PrefixExpr.java
@@ -6,7 +6,8 @@
 
 /**
  * 前缀表达式
- * Created by LZB on 2017/4/20.
+ *
+ * @author LZB
  */
 public class PrefixExpr {
 

diff --git a/...p24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/list/ArrayList.java b/...p24/1148285693/learning2017/learning-basic/src/main/java/me/lzb/basic/list/ArrayList.java
@@ -2,7 +2,8 @@
 
 /**
  * 简易ArrayList
- * Created by LZB on 2017/3/11.
+ *
+ * @author LZB
  */
 public class ArrayList implements List {