Skip to content

Commit f5c87c8

Browse files
philiphoangphiliphoang
committed
Nye eksempler i DFS/BFS
1 parent 8c95693 commit f5c87c8

File tree

2 files changed

+64
-84
lines changed

2 files changed

+64
-84
lines changed

Diff for: ‎Graphs/js/graphStructureController.js

+31-42
Original file line numberDiff line numberDiff line change
@@ -63,64 +63,53 @@ function checkOverlap(x, y) {
6363
/*************************************************************** */
6464
function exampleGraphStar() {
6565
resetAll();
66-
graphUIClicked(287, 230);
6766
graphUIClicked(73, 98);
67+
graphUIClicked(287, 230);
6868
graphUIClicked(266, 49);
6969
graphUIClicked(470, 82);
7070
graphUIClicked(573, 290);
7171
graphUIClicked(472, 464);
7272
graphUIClicked(201, 485);
7373
graphUIClicked(49, 325);
74-
twoNodesClicked(0, 1);
7574
graphUIClicked(298, 227);
76-
twoNodesClicked(2, 0);
7775
graphUIClicked(281, 235);
78-
twoNodesClicked(0, 3);
79-
twoNodesClicked(0, 4);
80-
twoNodesClicked(0, 5);
81-
twoNodesClicked(6, 0);
76+
twoNodesClicked(0, 1);
77+
twoNodesClicked(2, 0);
78+
twoNodesClicked(1, 3);
79+
twoNodesClicked(1, 4);
80+
twoNodesClicked(1, 5);
81+
twoNodesClicked(1, 6);
82+
twoNodesClicked(1, 7);
83+
twoNodesClicked(1, 2);
84+
twoNodesClicked(2, 3);
85+
twoNodesClicked(3, 4);
86+
twoNodesClicked(4, 5);
87+
twoNodesClicked(5, 6);
88+
twoNodesClicked(6, 7);
8289
twoNodesClicked(7, 0);
8390
instantCollapseAll();
8491
}
8592
function exampleGraphAllConnected() {
8693
resetAll();
87-
graphUIClicked(66, 71);
88-
graphUIClicked(337, 158);
89-
graphUIClicked(571, 64);
90-
graphUIClicked(77, 278);
91-
graphUIClicked(233, 306);
92-
graphUIClicked(420, 303);
93-
graphUIClicked(437, 454);
94-
graphUIClicked(134, 437);
95-
graphUIClicked(577, 184);
94+
graphUIClicked(60, 70);
95+
graphUIClicked(350, 70);
96+
graphUIClicked(600, 70);
97+
graphUIClicked(60, 300);
98+
graphUIClicked(350, 300);
99+
graphUIClicked(600, 300);
100+
graphUIClicked(60, 500);
101+
graphUIClicked(600, 500);
96102
twoNodesClicked(0, 1);
97-
twoNodesClicked(2, 1);
98-
twoNodesClicked(2, 0);
99-
twoNodesClicked(3, 0);
103+
twoNodesClicked(1, 2);
104+
twoNodesClicked(0, 3);
100105
twoNodesClicked(0, 4);
101-
twoNodesClicked(5, 0);
102-
twoNodesClicked(7, 0);
103-
twoNodesClicked(6, 0);
104-
twoNodesClicked(3, 2);
105-
twoNodesClicked(3, 1);
106-
twoNodesClicked(4, 3);
107-
twoNodesClicked(5, 3);
108-
twoNodesClicked(7, 3);
109-
twoNodesClicked(6, 3);
106+
twoNodesClicked(4, 6);
107+
twoNodesClicked(3, 4);
108+
twoNodesClicked(2, 5);
110109
twoNodesClicked(1, 5);
111-
twoNodesClicked(4, 1);
112-
twoNodesClicked(3, 1);
113-
twoNodesClicked(7, 1);
114-
twoNodesClicked(6, 1);
115-
twoNodesClicked(5, 2);
116-
twoNodesClicked(4, 5);
117-
twoNodesClicked(7, 5);
118-
twoNodesClicked(6, 5);
119-
twoNodesClicked(6, 4);
120-
twoNodesClicked(7, 4);
121-
twoNodesClicked(2, 7);
122-
twoNodesClicked(2, 6);
123-
twoNodesClicked(7, 6);
124-
twoNodesClicked(2, 4);
110+
twoNodesClicked(1, 4);
111+
twoNodesClicked(6, 7);
112+
twoNodesClicked(3, 6);
113+
twoNodesClicked(4, 7);
125114
instantCollapseAll();
126115
}

Diff for: ‎Graphs/js/graphStructureController.ts

+33-42
Original file line numberDiff line numberDiff line change
@@ -78,65 +78,56 @@ function checkOverlap(x: number, y: number) {
7878

7979
function exampleGraphStar() {
8080
resetAll();
81-
graphUIClicked(287, 230);
8281
graphUIClicked(73, 98);
82+
graphUIClicked(287, 230);
8383
graphUIClicked(266, 49);
8484
graphUIClicked(470, 82);
8585
graphUIClicked(573, 290);
8686
graphUIClicked(472, 464);
8787
graphUIClicked(201, 485);
8888
graphUIClicked(49, 325);
89-
twoNodesClicked(0, 1);
9089
graphUIClicked(298, 227);
91-
twoNodesClicked(2, 0);
9290
graphUIClicked(281, 235);
93-
twoNodesClicked(0, 3);
94-
twoNodesClicked(0, 4);
95-
twoNodesClicked(0, 5);
96-
twoNodesClicked(6, 0);
91+
92+
twoNodesClicked(0, 1);
93+
twoNodesClicked(2, 0);
94+
twoNodesClicked(1, 3);
95+
twoNodesClicked(1, 4);
96+
twoNodesClicked(1, 5);
97+
twoNodesClicked(1, 6);
98+
twoNodesClicked(1, 7);
99+
twoNodesClicked(1, 2);
100+
twoNodesClicked(2, 3);
101+
twoNodesClicked(3, 4);
102+
twoNodesClicked(4, 5);
103+
twoNodesClicked(5, 6);
104+
twoNodesClicked(6, 7);
97105
twoNodesClicked(7, 0);
98106
instantCollapseAll();
99107
}
100108

101109
function exampleGraphAllConnected() {
102110
resetAll();
103-
graphUIClicked(66, 71);
104-
graphUIClicked(337, 158);
105-
graphUIClicked(571, 64);
106-
graphUIClicked(77, 278);
107-
graphUIClicked(233, 306);
108-
graphUIClicked(420, 303);
109-
graphUIClicked(437, 454);
110-
graphUIClicked(134, 437);
111-
graphUIClicked(577, 184);
111+
graphUIClicked(60, 70);
112+
graphUIClicked(350, 70);
113+
graphUIClicked(600, 70);
114+
graphUIClicked(60, 300);
115+
graphUIClicked(350, 300);
116+
graphUIClicked(600, 300);
117+
graphUIClicked(60, 500);
118+
graphUIClicked(600, 500);
119+
112120
twoNodesClicked(0, 1);
113-
twoNodesClicked(2, 1);
114-
twoNodesClicked(2, 0);
115-
twoNodesClicked(3, 0);
121+
twoNodesClicked(1, 2);
122+
twoNodesClicked(0, 3);
116123
twoNodesClicked(0, 4);
117-
twoNodesClicked(5, 0);
118-
twoNodesClicked(7, 0);
119-
twoNodesClicked(6, 0);
120-
twoNodesClicked(3, 2);
121-
twoNodesClicked(3, 1);
122-
twoNodesClicked(4, 3);
123-
twoNodesClicked(5, 3);
124-
twoNodesClicked(7, 3);
125-
twoNodesClicked(6, 3);
124+
twoNodesClicked(4, 6);
125+
twoNodesClicked(3, 4);
126+
twoNodesClicked(2, 5);
126127
twoNodesClicked(1, 5);
127-
twoNodesClicked(4, 1);
128-
twoNodesClicked(3, 1);
129-
twoNodesClicked(7, 1);
130-
twoNodesClicked(6, 1);
131-
twoNodesClicked(5, 2);
132-
twoNodesClicked(4, 5);
133-
twoNodesClicked(7, 5);
134-
twoNodesClicked(6, 5);
135-
twoNodesClicked(6, 4);
136-
twoNodesClicked(7, 4);
137-
twoNodesClicked(2, 7);
138-
twoNodesClicked(2, 6);
139-
twoNodesClicked(7, 6);
140-
twoNodesClicked(2, 4);
128+
twoNodesClicked(1, 4);
129+
twoNodesClicked(6, 7);
130+
twoNodesClicked(3, 6);
131+
twoNodesClicked(4, 7);
141132
instantCollapseAll();
142133
}

0 commit comments

Comments
 (0)