Skip to content

Commit 19f80f5

Browse files
author
三歪
committed
fix package
1 parent 0dcfc69 commit 19f80f5

File tree

13 files changed

+182
-180
lines changed

13 files changed

+182
-180
lines changed

‎.idea/.gitignore‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/LeetCode/LeetCode96_144_145.java‎

Lines changed: 166 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,166 @@
1-
package LeetCode;
2-
3-
import java.util.ArrayList;
4-
import java.util.List;
5-
import java.util.Stack;
6-
7-
/**
8-
* 树的前中后序遍历
9-
*/
10-
public class LeetCode96_144_145 {
11-
12-
13-
// Definition for a binary tree node.
14-
public class TreeNode {
15-
int val;
16-
TreeNode left;
17-
TreeNode right;
18-
19-
TreeNode(int x) {
20-
val = x;
21-
}
22-
}
23-
24-
public List<Integer> inorderTraversal(TreeNode root) {
25-
26-
ArrayList<Integer> res = new ArrayList<Integer>();
27-
inorderTraversal(root, res);
28-
return res;
29-
}
30-
31-
private void inorderTraversal(TreeNode node, List<Integer> list) {
32-
if (node != null) {
33-
inorderTraversal(node.left, list);
34-
list.add(node.val);
35-
inorderTraversal(node.right, list);
36-
}
37-
}
38-
39-
public List<Integer> preorderTraversal(TreeNode root) {
40-
41-
ArrayList<Integer> res = new ArrayList<Integer>();
42-
preorderTraversal(root, res);
43-
return res;
44-
}
45-
46-
private void preorderTraversal(TreeNode node, List<Integer> list) {
47-
if (node != null) {
48-
list.add(node.val);
49-
preorderTraversal(node.left, list);
50-
preorderTraversal(node.right, list);
51-
}
52-
}
53-
54-
55-
public List<Integer> postorderTraversal(TreeNode root) {
56-
57-
ArrayList<Integer> res = new ArrayList<Integer>();
58-
postorderTraversal(root, res);
59-
return res;
60-
}
61-
62-
private void postorderTraversal(TreeNode node, List<Integer> list) {
63-
if (node != null) {
64-
postorderTraversal(node.left, list);
65-
postorderTraversal(node.right, list);
66-
list.add(node.val);
67-
}
68-
}
69-
70-
//----------------------非递归版
71-
72-
private class Command {
73-
String s; // go, print
74-
TreeNode node;
75-
76-
Command(String s, TreeNode node) {
77-
this.s = s;
78-
this.node = node;
79-
}
80-
}
81-
82-
;
83-
84-
public List<Integer> inorderTraversal2(TreeNode root) {
85-
86-
ArrayList<Integer> res = new ArrayList<Integer>();
87-
if (root == null)
88-
return res;
89-
90-
Stack<Command> stack = new Stack<Command>();
91-
stack.push(new Command("go", root));
92-
while (!stack.empty()) {
93-
Command command = stack.pop();
94-
if (command.s.equals("print"))
95-
res.add(command.node.val);
96-
else {
97-
assert command.s.equals("go");
98-
if (command.node.right != null)
99-
stack.push(new Command("go", command.node.right));
100-
stack.push(new Command("print", command.node));
101-
if (command.node.left != null)
102-
stack.push(new Command("go", command.node.left));
103-
}
104-
}
105-
return res;
106-
}
107-
108-
109-
/**
110-
* 前序遍历,迭代法
111-
*/
112-
public List<Integer> preorderTraversal(TreeNode root) {
113-
List<Integer> result = new ArrayList<>();
114-
if (root == null) return result;
115-
Stack<TreeNode> stack = new Stack<>();
116-
stack.push(root);
117-
while (!stack.isEmpty()) {
118-
TreeNode node = stack.pop();
119-
result.add(node.val);
120-
if (node.right != null) stack.push(node.right);
121-
if (node.left != null) stack.push(node.left);
122-
}
123-
return result;
124-
}
125-
126-
/**
127-
* 后序遍历
128-
*
129-
* @param root
130-
* @return
131-
*/
132-
public List<Integer> postorderTraversal(TreeNode root) {
133-
List<Integer> result = new ArrayList<>();
134-
if (root == null) return result;
135-
Deque<TreeNode> stack = new ArrayDeque<>();
136-
stack.push(root);
137-
while (!stack.isEmpty()) {
138-
TreeNode node = stack.pop();
139-
result.add(node.val);
140-
if (node.left != null) stack.push(node.left);
141-
if (node.right != null) stack.push(node.right);
142-
}
143-
Collections.reverse(result);
144-
return result;
145-
}
146-
147-
/**
148-
* 中序遍历
149-
*
150-
* @param root
151-
* @return
152-
*/
153-
public List<Integer> inorderTraversal(TreeNode root) {
154-
List<Integer> result = new ArrayList<>();
155-
if (root == null) return result;
156-
Deque<TreeNode> stack = new ArrayDeque<>();
157-
while (root != null || !stack.isEmpty()) {
158-
while (root != null) {
159-
stack.push(root);
160-
root = root.left;
161-
}
162-
TreeNode node = stack.pop();
163-
result.add(node.val);
164-
root = node.right;
165-
}
166-
return result;
167-
}
168-
}
1+
//package LeetCode;
2+
//
3+
//import java.util.*;
4+
//
5+
///**
6+
// * 树的前中后序遍历
7+
// */
8+
//public class LeetCode96_144_145 {
9+
//
10+
//
11+
// // Definition for a binary tree node.
12+
// public class TreeNode {
13+
// int val;
14+
// TreeNode left;
15+
// TreeNode right;
16+
//
17+
// TreeNode(int x) {
18+
// val = x;
19+
// }
20+
// }
21+
//
22+
// public List<Integer> inorderTraversal(TreeNode root) {
23+
//
24+
// ArrayList<Integer> res = new ArrayList<Integer>();
25+
// inorderTraversal(root, res);
26+
// return res;
27+
// }
28+
//
29+
// private void inorderTraversal(TreeNode node, List<Integer> list) {
30+
// if (node != null) {
31+
// inorderTraversal(node.left, list);
32+
// list.add(node.val);
33+
// inorderTraversal(node.right, list);
34+
// }
35+
// }
36+
//
37+
// public List<Integer> preorderTraversal(TreeNode root) {
38+
//
39+
// ArrayList<Integer> res = new ArrayList<Integer>();
40+
// preorderTraversal(root, res);
41+
// return res;
42+
// }
43+
//
44+
// private void preorderTraversal(TreeNode node, List<Integer> list) {
45+
// if (node != null) {
46+
// list.add(node.val);
47+
// preorderTraversal(node.left, list);
48+
// preorderTraversal(node.right, list);
49+
// }
50+
// }
51+
//
52+
//
53+
// public List<Integer> postorderTraversal(TreeNode root) {
54+
//
55+
// ArrayList<Integer> res = new ArrayList<Integer>();
56+
// postorderTraversal(root, res);
57+
// return res;
58+
// }
59+
//
60+
// private void postorderTraversal(TreeNode node, List<Integer> list) {
61+
// if (node != null) {
62+
// postorderTraversal(node.left, list);
63+
// postorderTraversal(node.right, list);
64+
// list.add(node.val);
65+
// }
66+
// }
67+
//
68+
// //----------------------非递归版
69+
//
70+
// private class Command {
71+
// String s; // go, print
72+
// TreeNode node;
73+
//
74+
// Command(String s, TreeNode node) {
75+
// this.s = s;
76+
// this.node = node;
77+
// }
78+
// }
79+
//
80+
// ;
81+
//
82+
// public List<Integer> inorderTraversal2(TreeNode root) {
83+
//
84+
// ArrayList<Integer> res = new ArrayList<Integer>();
85+
// if (root == null)
86+
// return res;
87+
//
88+
// Stack<Command> stack = new Stack<Command>();
89+
// stack.push(new Command("go", root));
90+
// while (!stack.empty()) {
91+
// Command command = stack.pop();
92+
// if (command.s.equals("print"))
93+
// res.add(command.node.val);
94+
// else {
95+
// assert command.s.equals("go");
96+
// if (command.node.right != null)
97+
// stack.push(new Command("go", command.node.right));
98+
// stack.push(new Command("print", command.node));
99+
// if (command.node.left != null)
100+
// stack.push(new Command("go", command.node.left));
101+
// }
102+
// }
103+
// return res;
104+
// }
105+
//
106+
//
107+
// /**
108+
// * 前序遍历,迭代法
109+
// */
110+
// public List<Integer> preorderTraversal(TreeNode root) {
111+
// List<Integer> result = new ArrayList<>();
112+
// if (root == null) return result;
113+
// Stack<TreeNode> stack = new Stack<>();
114+
// stack.push(root);
115+
// while (!stack.isEmpty()) {
116+
// TreeNode node = stack.pop();
117+
// result.add(node.val);
118+
// if (node.right != null) stack.push(node.right);
119+
// if (node.left != null) stack.push(node.left);
120+
// }
121+
// return result;
122+
// }
123+
//
124+
// /**
125+
// * 后序遍历
126+
// *
127+
// * @param root
128+
// * @return
129+
// */
130+
// public List<Integer> postorderTraversal(TreeNode root) {
131+
// List<Integer> result = new ArrayList<>();
132+
// if (root == null) return result;
133+
// Deque<TreeNode> stack = new ArrayDeque<>();
134+
// stack.push(root);
135+
// while (!stack.isEmpty()) {
136+
// TreeNode node = stack.pop();
137+
// result.add(node.val);
138+
// if (node.left != null) stack.push(node.left);
139+
// if (node.right != null) stack.push(node.right);
140+
// }
141+
// Collections.reverse(result);
142+
// return result;
143+
// }
144+
//
145+
// /**
146+
// * 中序遍历
147+
// *
148+
// * @param root
149+
// * @return
150+
// */
151+
// public List<Integer> inorderTraversal(TreeNode root) {
152+
// List<Integer> result = new ArrayList<>();
153+
// if (root == null) return result;
154+
// Deque<TreeNode> stack = new ArrayDeque<>();
155+
// while (root != null || !stack.isEmpty()) {
156+
// while (root != null) {
157+
// stack.push(root);
158+
// root = root.left;
159+
// }
160+
// TreeNode node = stack.pop();
161+
// result.add(node.val);
162+
// root = node.right;
163+
// }
164+
// return result;
165+
// }
166+
//}

‎src/datastructure/LinkedList_old/LinkListText.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package LinkList;
1+
package datastructure.LinkedList_old;
22

33
/**
44
* 链表测试
5-
* Created by ozc on 2018/3/27.
5+
* Created by 公众号Java3y on 2018/3/27.
66
*
7-
* @author ozc
7+
* @author 公众号Java3y
88
* @version 1.0
99
*/
1010
public class LinkListText {

‎src/datastructure/LinkedList_old/Node.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package LinkList;
1+
package datastructure.LinkedList_old;
22

33
/**
44
* 链表的节点

‎src/datastructure/queue_old/Queue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package queue;
1+
package datastructure.queue_old;
22

33
/**
44
* Created by ozc on 2018/3/28.

‎src/datastructure/queue_old/QueueTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package queue;
1+
package datastructure.queue_old;
22

33
/**
44
* Created by ozc on 2018/3/28.

‎src/datastructure/stack_old/Node.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package stack;
1+
package datastructure.stack_old;
22

33
/**
44
* 节点(组成栈)

‎src/datastructure/stack_old/Stack.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package stack;
1+
package datastructure.stack_old;
22

33
/**
44
* 栈的数据模型

‎src/datastructure/stack_old/StackTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package stack;
1+
package datastructure.stack_old;
22

33
/**
44
* Created by ozc on 2018/3/28.

‎src/datastructure/tree_old/TreeNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tree;
1+
package datastructure.tree_old;
22

33
/**
44
* 树的节点

0 commit comments

Comments
 (0)