Skip to content

Commit bfa8145

Browse files
michielbdejongmichielbdejong
committed
Now finding 351 unique loops in the 50k dataset
1 parent d6d3cd9 commit bfa8145

File tree

2 files changed

+353
-13
lines changed

2 files changed

+353
-13
lines changed

‎__tests__/fixtures/sarafu-50k.solution‎

Lines changed: 347 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,351 @@
1+
4037 1815 3393 70
2+
1871 1821 1828 4533 1904 2621 20
3+
1894 3026 3018 150
4+
1844 1862 1933 100
5+
1871 1828 6467 1821 1894 4533 1927 50
6+
1871 1877 1844 1894 7727 1828 13390 5
7+
3018 5618 2621 720
8+
1871 1893 1883 1861 2329 11786 2300 1851 2343 1821 2342 20
9+
3018 7727 1904 150
10+
3018 6504 1863 1821 100
11+
1821 2621 7727 1896 150
12+
1871 3018 8357 1863 235
13+
3360 3191 7205 7391 220
14+
3360 3396 1794 60
15+
3360 4334 3382 170
16+
3360 6105 3133 400
17+
7205 7891 4707 1794 90
18+
3360 7205 8503 100
119
4035 2602 1790 60
2-
6668 6831 6675 100
3-
8013 9936 7893 150
4-
10786 10790 10798 100
20+
644 661 658 733 40
21+
661 1217 707 20
22+
663 661 1593 1880
23+
644 779 663 722 4038 658 767 130
24+
663 4038 796 300
25+
661 1963 3600 7793 1593 664 50
26+
796 659 661 2264 1698 1593 779 100
27+
4038 7629 661 4036 7530
28+
644 791 663 7090 4038 1254 661 4033 1090 60
29+
1593 1191 707 190
30+
796 1254 1593 791 707 100
31+
661 4604 4594 5036 5147 40
32+
6744 8988 6668 100
33+
644 796 1593 1922 2356 661 7720 7988 4027 50
34+
796 7629 767 659 1254 5524 42
35+
1257 791 1254 7869 30
36+
5524 2155 774 700
37+
1257 7932 5391 100
38+
1593 6414 1757 1800
39+
1593 3113 7629 1191 1283 100
40+
7810 11834 7933 50
41+
1791 2421 12570 50
42+
2348 12407 10542 5
43+
1889 1821 4533 2515 6504 80
44+
1871 3362 4533 2612 90
45+
1871 3396 1821 4764 3526 4
46+
1871 4533 5341 6504 1896 170
47+
1871 4764 4533 6596 110
48+
1871 3144 3381 3390 7205 9665 3133 6900 644 1099 4033 2353 2735 3035 3191 12485 4027 1889 5
49+
1871 6504 1904 8357 1896 2343 1
50+
6504 1927 4764 40
51+
2343 4533 7017 7727 420
52+
2343 3362 6504 5842 6596 320
53+
2343 6504 6651 4533 7029 400
54+
1871 6642 2343 7020 4533 7643 1
55+
1871 7011 6504 6700 180
56+
6504 8234 1821 150
57+
1871 7020 6504 7876 80
58+
2515 7020 7727 100
59+
1871 7029 6504 8357 2359 1821 8333 1861 2610 9171 8363 3940 5
60+
1871 7654 1889 4533 7735 50
61+
1871 7243 1821 8357 3526 2343 8039 1863 1889 1883 6522 1933 1
62+
1871 7727 3362 7047 8357 4533 7876 3783 6467 20
63+
1871 8357 6642 4533 8106 40
64+
1881 8246 8236 100
65+
1871 8875 2343 8357 7654 1933 4533 8234 121
66+
9247 6504 8875 11692 2343 40
67+
1871 10655 10008 5
68+
1871 10096 8357 7876 7007 155
69+
1871 10657 3362 8357 8123 166
70+
1871 11465 8357 8234 6700 4533 8752 40
71+
6 9 5 10
72+
36 9915 598 10
73+
8494 8130 8223 120
74+
4442 3016 4549 100
75+
6199 6433 6900 8322 8270 4027 21
76+
514 1356 5 4
77+
4533 1904 2621 7727 1828 380
78+
514 8736 820 1349 2
79+
6 514 11542 33.3
80+
6228 10442 12465 12459 10147 73
81+
1766 4552 4937 300
82+
1883 1861 2329 11786 2300 4533 1927 6700 20
83+
1766 2383 2115 3305 4522 150
84+
1899 4599 7674 1918 2810 4558 500
85+
1899 4720 1918 4725 900
86+
1899 4756 1913 600
87+
1899 6 820 6228 11542 4761 1918 10
88+
5582 2981 2383 700
89+
3941 5942 5838 200
90+
4761 3305 6 2017 20
91+
1766 7658 4937 2115 5759 30
92+
4533 2612 6991 8357 1863 5
93+
1766 5582 6281 4763 12943 1918 2115 4756 1913 80
94+
6900 8322 8270 4027 6431 6433 50
95+
4761 5149 3305 4522 200
96+
4027 6201 3191 12485 400
97+
7727 3362 2621 6280
98+
4755 2810 4558 2383 5585 100
99+
5529 4702 4703 800
100+
9149 834 8319 3842 20
101+
5037 5027 5028 10
102+
5028 5030 5032 50
103+
6772 4720 4598 300
104+
5529 7924 2020 1660 50
105+
1913 1918 2115 4756 320
106+
4533 7643 7020 300
107+
8368 5037 5032 5033 65
108+
1913 2115 7980 200
109+
1352 713 1349 50
110+
5205 8984 1352 100
111+
1766 11342 5582 6986 9970 3305 4942 100
112+
1766 12504 12508 3860 280
113+
1596 4857 731 2155 1000
114+
1766 12508 4937 2383 5585 400
115+
4522 12250 6 100
116+
1518 2075 6778 10668 2057 5
117+
1766 12757 9970 5483 2115 7980 2810 50
118+
1933 4533 7735 7654 30
119+
3305 4942 7451 1050
120+
3191 12485 12478 12480 5
121+
6831 6675 6668 100
122+
6596 2359 6426 2342 7029 40
123+
4522 12309 3305 9549 20
124+
3035 2421 12570 70
125+
1518 11702 10504 200
126+
6501 6900 10653 2075 9991 6679 4027 2
127+
4720 4756 1918 6281 700
128+
4027 6934 6920 400
129+
4725 1913 4720 4598 4599 7674 1918 50
130+
4418 499 86 20
131+
3600 7793 1963 100
132+
1698 1713 1759 1706 1711 5
133+
4522 12598 11342 300
134+
7010 6501 7530 4027 100
135+
1913 7674 10881 1000
136+
8322 8326 7899 100
137+
7727 6467 8357 7017 400
138+
11342 6986 3305 150
139+
499 829 2072 10
140+
499 500 520 20
141+
7902 8266 8322 8789 270
142+
10271 10147 10181 45
143+
10147 10180 10181 10211 90
144+
4558 12812 13071 2981 5585 5334 2383 7658 4937 2115 4756 200
145+
4558 12943 1918 6281 300
146+
1998 500 2072 20
147+
4755 4558 13083 4756 6281 300
148+
1899 4761 6772 5149 4522 13449 11342 7447 6 4552 50
149+
499 834 8319 8303 30
150+
8799 8798 8796 2
151+
7727 6642 7020 100
152+
4033 3293 3797 20
153+
4755 4756 10770 200
154+
4763 12943 6281 77
155+
9970 5483 11381 50
156+
7655 7656 499 50
157+
7857 8025 7798 11159 7898 7820 7950 7916 7837 7963 7947 80
158+
3381 3390 8758 240
159+
10788 10792 10791 200
160+
10798 10786 10790 100
161+
4761 7447 12309 450
162+
733 11536 1190 10
163+
9820 9831 9834 5
164+
499 6799 3612 2117 2165 6410 20
165+
7081 9240 9726 50
166+
7434 8477 5040 245
167+
10180 10223 10181 10211 20
168+
9653 7638 6694 50
169+
7989 3305 13071 4761 70
170+
9991 8637 10640 10495 10490 2075 5
171+
10181 10442 12465 13135 10456 53
172+
8732 8731 8730 10
173+
8326 8798 11351 65
174+
10252 10181 11588 10456 15
175+
10149 10151 10157 10154 5
176+
10750 12912 11381 200
177+
6594 9970 12595 100
178+
6297 5999 4193 260
179+
5585 5334 2383 1070
180+
8073 7953 9907 150
181+
4755 11492 4558 13096 6281 8364 300
182+
10442 13137 13132 12462 10456 23
183+
10229 10227 10235 50
184+
7898 7820 11312 7916 120
185+
9813 9905 9884 20
186+
10180 10252 10452 35
187+
10486 2079 2075 50
188+
10748 10390 10881 13245 1918 5149 7451 6986 12812 12309 5805 5483 50
189+
10227 10240 10206 200
190+
10231 10227 10249 20
191+
8357 2359 10883 200
192+
10180 10456 10452 11133 20
193+
6772 7989 4756 6281 800
194+
12943 13083 13071 11492 500
195+
7658 5585 7289 5334 170
196+
6700 7727 8752 1927 50
197+
9882 9878 9881 2
198+
10456 12465 13316 13128 45
199+
7898 9520 7979 150
200+
2197 11326 11301 50
201+
10881 13251 12515 1500
202+
5207 4640 4648 140
203+
10459 10229 10231 10240 50
204+
10748 11378 10675 100
205+
11649 7209 11650 200
206+
8729 8731 8730 8744 5
207+
5334 11508 10770 600
208+
11300 2197 11512 11301 100
209+
4755 13065 6281 13233 300
210+
4937 2115 12508 3860 4552 60
211+
2115 10750 13110 13111 12812 12309 5805 5483 250
212+
8819 8273 8808 8707 11088 50
213+
11330 9438 9450 70
214+
8819 8707 11092 8808 150
215+
8822 9129 6189 105
216+
7489 7491 7956 7519 100
217+
6804 3186 3401 130
218+
8823 7455 9812 400
219+
9954 9953 9689 10
220+
13096 13123 13126 13116 300
221+
9914 9869 9932 2
222+
8820 8819 10595 8808 2
223+
8738 5372 8729 8737 5
224+
6297 10275 5999 8879 5
225+
7243 7250 7247 100
226+
8234 1883 6522 7654 4533 40
227+
1913 10403 10396 7980 2810 7658 7307 5334 11520 50
228+
7626 1507 1515 550
229+
7674 10031 4937 2383 10770 200
230+
8030 7871 8013 100
231+
8791 8787 3395 3501 7015 30
5232
2155 5196 6130 15
233+
11084 4683 4685 200
234+
9256 9257 10273 10
235+
6772 12911 1918 5149 7989 8364 200
236+
13126 13419 13116 13492 13220 700
237+
7511 7956 7519 60
238+
8808 11084 11094 100
239+
9917 11370 9421 9911 9449 11249 7859 7916 11156 20
240+
1139 658 779 5584 1138 12154 200
241+
10074 9953 9689 70
242+
5585 13233 13490 450
243+
7898 10038 9875 11087 11135 11605 11185 11099 20
244+
6772 13071 11342 7989 11381 100
245+
10001 10649 10723 45
246+
2155 2248 12066 12176 1291 8680 3
247+
7626 8711 9097 1250
248+
2155 6402 9100 780
249+
10988 11609 11608 9173 11611 60
250+
10675 10400 10396 50
251+
9326 7876 7868 50
252+
7626 7300 8711 6032 40
253+
8820 11092 11093 280
254+
9997 10001 10654 150
255+
10243 10240 12438 10
256+
7950 9155 11292 11325 8045 11370 60
257+
6679 11451 8820 11450 20
258+
11288 11583 8474 10
259+
10640 13140 10500 2075 10503 10484 5
260+
12383 11662 11657 70
261+
10504 10668 2057 2075 70
262+
11036 7350 11037 60
263+
6986 12812 13071 200
264+
11605 11185 11099 40
265+
12471 12519 12518 50
266+
4756 6281 13530 20
267+
11341 11626 11605 20
268+
12498 12471 12531 12518 200
269+
9869 9932 9930 2
270+
7798 11159 7898 11120 8134 8191 8025 20
271+
12509 12519 12628 9362 13401 50
272+
8013 9936 7893 150
273+
7989 13110 13111 12812 13071 11492 6281 50
274+
6772 13578 7989 13346 200
275+
12154 1290 1138 160
276+
11337 7948 11264 7882 10038 9875 65
277+
12509 12531 12518 90
278+
5218 10544 10542 1
279+
13592 13586 13593 100
280+
2509 7479 10669 12
281+
12206 13410 12475 13408 30
282+
2513 2509 7864 85
283+
6758 7422 6842 75
284+
10390 7980 11378 100
285+
13230 12519 13076 13270 20
286+
10390 10403 10400 50
287+
6994 9669 9417 300
288+
12160 4210 784 5
289+
11437 7980 11385 11378 50
290+
11249 7859 7916 11309 9520 7979 7947 80
291+
10501 10491 10865 50
292+
12628 13386 13076 13270 150
293+
12309 5805 11486 11493 12313 300
294+
12628 13365 13504 12519 20
295+
4725 4720 12515 200
296+
1918 5149 11381 7980 300
297+
13334 13409 13411 20
298+
8073 9919 11251 50
299+
9346 7808 11619 11312 11325 8045 11087 11135 11609 11608 25
300+
10485 2075 11034 50
301+
12592 12758 12595 50
302+
9444 11276 9438 11209 11254 65
303+
6994 9888 9660 110
304+
7350 11037 12200 60
305+
7298 4788 6899 50
306+
6994 9898 8071 120
6307
8303 8392 8287 30
7-
9257 10273 9256 10
8-
8984 5202 5205 70
308+
6994 9901 9712 100
309+
7863 7814 7849 6424 7953 30
310+
10396 13111 11381 7980 2810 250
311+
7409 7352 7657 360
312+
6994 9913 9711 110
313+
11249 11366 7982 9449 130
314+
6994 9922 9438 108
315+
8357 7654 7760 20
316+
6994 9930 9406 5
317+
9520 7979 11619 11309 20
318+
11213 11337 11240 9661 9916 11372 7882 53
319+
12465 13316 13128 15
320+
5740 9919 9876 2
321+
11342 12246 12567 50
322+
8357 7876 8123 6467 45
323+
12968 13137 13132 42
324+
9448 10167 10178 6424 7953 86
325+
10240 12438 10458 20
326+
12459 12968 13316 13135 12462 22
327+
11313 11257 11099 11312 11185 7806 20
328+
2075 12748 11726 200
329+
13116 13492 13220 13419 200
330+
8357 8752 1927 800
331+
2810 11381 7980 100
332+
8045 7916 11309 140
333+
8849 7863 9155 11292 11259 90
334+
6505 9438 11209 23
335+
11332 8848 9670 11194 11232 100
336+
13477 2810 11385 170
337+
2383 12508 13477 11706 27
338+
10008 1877 1875 100
339+
8333 1925 4292 10008 330
340+
12990 11480 2383 10
341+
6505 11276 7859 10917 69
342+
11325 8045 11626 7808 50
343+
9661 9916 11372 11240 47
344+
11609 11626 7808 100
345+
6424 8072 9839 250
346+
13419 13492 13220 100
347+
8238 8215 8247 5
348+
8707 11092 11093 120
349+
3779 3311 8269 8735 30
9350
3924 6960 3932 69
10-
499 7655 7656 50
11-
7810 11834 7933 50
12-
6 8264 8235 10
351+
12623 13365 13504 20

‎src/Jerboa.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ const RANDOM_NEXT_STEP = false;
88
const LEDGER_SCALE = 1000000;
99
const MAX_TRANSFER_AMOUNT = 1000000;
1010
const MAX_INCARNATION = 10000;
11-
const MIN_PROBE_STARTING_INTERVAL = 1000;
12-
const MAX_PROBE_STARTING_INTERVAL = 2000;
11+
const INITIAL_PROBE_STARTING_DELAY = 500; // give the simulation script some time to load in the credit graph
12+
const MIN_PROBE_STARTING_INTERVAL = 5000;
13+
const MAX_PROBE_STARTING_INTERVAL = 10000;
1314
export type JerboaOptions = {
1415
name: string,
1516
solutionCallback: (line: string) => void,
@@ -108,15 +109,15 @@ export class Jerboa {
108109
this.name = options.name;
109110
this.solutionCallback = options.solutionCallback;
110111
this.sendMessageCb = options.sendMessage;
111-
this.probeStartingTimer();
112+
setTimeout(this.probeStartingTimer.bind(this), INITIAL_PROBE_STARTING_DELAY);
112113
}
113-
probeStartingTimer() {
114+
probeStartingTimer(): void {
114115
if (this.balances.haveIncomingAndOutgoingLinks()) {
115116
this.debug(`transfer receiver ${this.name} starts probe`);
116117
this.startProbe();
117118
}
118119
const nextTrigger = MIN_PROBE_STARTING_INTERVAL + Math.random() * (MAX_PROBE_STARTING_INTERVAL - MIN_PROBE_STARTING_INTERVAL);
119-
console.log(this.name, nextTrigger);
120+
// console.log(this.name, nextTrigger);
120121
setTimeout(this.probeStartingTimer.bind(this), nextTrigger);
121122

122123
}

0 commit comments

Comments
 (0)