⚡ Sangsakala Proxy 🏠 Home
Skip to content

Commit ae1b40e

Browse files
benaichbenaich
committed
revision tweaks
1 parent 6aac789 commit ae1b40e

7 files changed

Lines changed: 56 additions & 36 deletions

File tree

‎GraphAPI/EdgeWeightedDigraph/Graph.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ public static void main(String[] args) {
135135

136136
int from=0, to=6;
137137
System.out.println("------- getShortestPath from " +from+ " To " +to+" -------");
138-
Stack<Edge> path = g.getShortestPath(0, 6);
138+
Stack<Edge> path = g.getShortestPath(from, to);
139139
System.out.print(from);
140140
while (!path.isEmpty()) {
141141
System.out.print(" -> " + path.pop().to());
142142
}
143143

144-
System.out.println("Done");
144+
System.out.println("");
145145
}
146146
}
147147

‎GraphAPI/Graph.java‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.io.FileReader;
66
import java.io.IOException;
77
import java.util.HashMap;
8+
import java.util.Iterator;
89
import java.util.LinkedList;
910
import java.util.List;
1011
import java.util.Map;
@@ -80,6 +81,7 @@ public void dfs(int s) {
8081
} else if (color[x] = color[s]) {
8182
bipart = false;
8283
} else {
84+
//not working need dfs(s, origin)
8385
isCycle = true;
8486
}
8587
});
@@ -100,18 +102,20 @@ public boolean pathExist(int a, int b) {
100102
}
101103

102104
/* get a path between a and b */
103-
public List<Integer> getPath(int a, int b) {
104-
if (!pathExist(a, b)) {
105-
return null;
106-
}
107-
List<Integer> list = new Stack();
105+
public Stack<Integer> getPath(int a, int b)
106+
{
107+
if (!pathExist(a, b)) return null;
108+
Stack<Integer> path = new Stack<>();
109+
108110
while (a != b) {
109-
list.add(b);
111+
path.push(b);
110112
b = parent[b];
111113
}
112-
return list;
114+
path.push(a);
115+
return path;
113116
}
114117

118+
115119
/* check if all element of the graph are connected */
116120
public boolean isConnexe() {
117121
exProfondeur(adj[0].get(0));
@@ -226,10 +230,22 @@ public static void main(String[] args) {
226230
System.out.println("yes");
227231
else System.out.println("no");
228232

229-
System.out.println("------- pathExist -------");
230-
if(g.pathExist(1 , 0))
233+
System.out.println("------- pathExist(0, 4) -------");
234+
if(g.pathExist(0, 4))
231235
System.out.println("yes");
232236
else System.out.println("no");
237+
238+
System.out.println("------- pathExist(3, 0) -------");
239+
if(g.pathExist(3, 0))
240+
System.out.println("yes");
241+
else System.out.println("no");
242+
243+
System.out.println("------- path(3, 0) -------");
244+
Stack<Integer> path1 = g.getPath(3,0);
245+
while (!path1.isEmpty()) {
246+
System.out.print(path1.pop() + " -> ");
247+
}
248+
System.out.println("");
233249

234250
System.out.println("------- isConnexe -------");
235251
if(g.isConnexe())

‎HashTable/Cuckoo/CuckooHashTable.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public int getNumResizes() {
5454
}
5555

5656
@Override
57-
public double getDistribution(){return 0;};
57+
public double getDistribution(){return 0;}
5858

5959
@Override
6060
public int indexOf(K key) {
@@ -92,7 +92,8 @@ public void put(K key, V val) {
9292
}
9393

9494
public void put(Node<K, V> node, int nuberOftries) {
95-
if(nuberOftries==0)rehache(tableSize);
95+
if(nuberOftries==0)
96+
rehache(tableSize);
9697
int index = (node.getStatus()) ? 1 : 0;
9798
int hachCode = node.hachCode[index];
9899
Node<K, V> tmp = array[index][hachCode];

‎Heap/LLRB.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public Node rotateLeft() {
2323
return build(right.key, build(key, left, right.left, RED), right.right, color);
2424
}
2525

26-
public Node rotateRihgt() {
27-
return build(left.key, left.left, build(key, right, left.right, RED), color);
26+
public Node rotateRight() {
27+
return build(left.key, left.left, build(key, left.right, right, RED), color);
2828
}
2929

3030
public void sand() {
@@ -38,7 +38,7 @@ public Node balance() {
3838
return rotateLeft().balance();
3939
}
4040
if (isRed(left) && isRed(left.left)) {
41-
return rotateRihgt();
41+
return rotateRight();
4242
}
4343
return this;
4444
}
@@ -99,6 +99,8 @@ public static void main(String[] args) {
9999
root = app.put(root, 3);
100100
root = app.put(root, 5);
101101
root = app.put(root, 6);
102+
root = app.put(root, 8);
103+
root = app.put(root, 9);
102104
app.printNice(root, 1);
103105

104106
}

‎List/ListModule.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,10 @@ public static <T> List<T> qSort(List<T> l, Comparator<? super T> c) {
252252
List<T> inf = l.tail().filter((x) -> c.compare(x, l.head()) < 0);
253253
List<T> sup = l.tail().filter((x) -> c.compare(x, l.head()) > 0);
254254
List<T> rest = l.tail().filter((x) -> c.compare(x, l.head()) == 0);
255-
return concat(concat(qSort(inf, c), list(l.head(), emptyList())),
256-
concat(qSort(rest, c), qSort(sup, c)));
255+
return concat(
256+
concat(qSort(inf, c), list(l.head(), rest)),
257+
qSort(sup, c)
258+
);
257259
}
258260

259261
public static <T> Optional<T> min(List<T> l, Comparator<T> c) {

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ Dynamic Programming
1919
+ Fibonacci
2020
+ LCS
2121

22+
2014/02/16 - 2014/03/16

‎StableMarriage/Person.java‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,39 @@ public class Person {
99
private List<Person> candidates;
1010
private int candidateIndex;
1111

12-
public List<Person> getCandidates() {
13-
return candidates;
14-
}
15-
16-
public int getCandidateIndex() {
17-
return candidateIndex;
18-
}
1912

2013
Person(String name) {
2114
this.name = name;
2215
this.partner = null;
2316
this.candidates = new ArrayList<>();
2417
this.candidateIndex = 0;
2518
}
26-
27-
public void setCandidates(Person... candidates) {
28-
this.candidates.addAll(Arrays.asList(candidates));
29-
}
30-
31-
public void setCandidateIndex(int candidateIndex) {
32-
this.candidateIndex = candidateIndex;
33-
}
3419

20+
/* getters & setters */
3521
public String getName(){
3622
return this.name;
3723
}
3824
public void setName(String name) {
3925
this.name = name;
4026
}
41-
4227
public Person getPartner(){
4328
return this.partner;
4429
}
4530
public void setPartner(Person partner) {
4631
this.partner = partner;
4732
}
33+
public List<Person> getCandidates() {
34+
return candidates;
35+
}
36+
public void setCandidates(Person... candidates) {
37+
this.candidates.addAll(Arrays.asList(candidates));
38+
}
39+
public int getCandidateIndex() {
40+
return candidateIndex;
41+
}
42+
public void setCandidateIndex(int candidateIndex) {
43+
this.candidateIndex = candidateIndex;
44+
}
4845

4946
/* get the prefered person from the available list */
5047
public Person getNext(){
@@ -64,10 +61,11 @@ public boolean prefers(Person p){
6461
return (this.rank(p) < this.rank(this.partner));
6562
}
6663

64+
/* engage this person to a partner */
6765
public void engageTo(Person p){
68-
if(p.partner != null) p.partner.partner = null;
66+
if(p.partner != null) p.partner.setPartner(null);
6967
p.partner = this;
70-
if(this.partner != null) this.partner.partner = null;
68+
if(this.partner != null) this.partner.setPartner(null);
7169
this.partner = p;
7270
}
7371
}

0 commit comments

Comments
 (0)