Skip to content

Commit 6fa6d4f

Browse files
committed
Fix tests for strain and other small changes
1 parent 80a3faa commit 6fa6d4f

File tree

5 files changed

+22
-25
lines changed

5 files changed

+22
-25
lines changed

Diff for: exercises/practice/pangram/.meta/pangram.ys

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
!yamlscript/v0
22

33
defn is-pangram(sentence):
4-
26 ==:
5-
len: lc(sentence)
4+
26 ==: lc(sentence)
65
.replace(/[^a-z]/)
7-
.distinct()
6+
.distinct():len

Diff for: exercises/practice/perfect-numbers/perfect-numbers-test.ys

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ test::
1616
- name: Large perfect number is classified correctly
1717
code: classify(33550336)
1818
want: perfect
19+
SKIP: true # SLOW
1920

2021
- name: Smallest abundant number is classified correctly
2122
code: classify(12)
@@ -28,6 +29,7 @@ test::
2829
- name: Large abundant number is classified correctly
2930
code: classify(33550335)
3031
want: abundant
32+
SKIP: true # SLOW
3133

3234
- name: Smallest prime deficient number is classified correctly
3335
code: classify(2)
@@ -44,6 +46,7 @@ test::
4446
- name: Large deficient number is classified correctly
4547
code: classify(33550337)
4648
want: deficient
49+
SKIP: true # SLOW
4750

4851
- name: Edge case (no factors other than itself) is classified correctly
4952
code: classify(1)
@@ -59,4 +62,4 @@ test::
5962
what: error
6063
want: Classification is only possible for positive integers.
6164

62-
done: 13
65+
done: 10 # 13

Diff for: exercises/practice/raindrops/.meta/raindrops.ys

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ defn convert(number):
44
ps =: M(3 'Pling' 5 'Plang' 7 'Plong')
55
words =:
66
mapcat _ [3 5 7]:
7-
fn(n):
8-
(number % n) == 0 &&&:
9-
get ps: n
7+
fn(n): number.rem(n).! &&& ps.$n
108

11-
if words.?:
12-
str(words*)
13-
str(number)
9+
if words.?: str(words*) str(number)

Diff for: exercises/practice/resistor-color-duo/.meta/resistor-color-duo.ys

-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ colors =:
77

88
defn value([c1 c2]):
99
colors.$c1 * 10 +: colors.$c2
10-

Diff for: exercises/practice/strain/strain-test.ys

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@ use: strain
66

77
test::
88
- name: Keep on empty list returns empty list
9-
code: keep([] "fn([x] true)")
9+
code: keep([] \(true))
1010
want: []
1111

1212
- name: Keeps everything
13-
code: keep([1 3 5] "fn(x):\ true")
13+
code: keep([1 3 5] \(true))
1414
want:
1515
- 1
1616
- 3
1717
- 5
1818

1919
- name: Keeps nothing
20-
code: keep([1 3 5] "fn(x):\ false")
20+
code: keep([1 3 5] \(false))
2121
want: []
2222

2323
- name: Keeps first and last
24-
code: keep([1 2 3] "fn(x):\ (x % 2) == 1")
24+
code: keep([1 2 3] \((_ % 2) == 1))
2525
want:
2626
- 1
2727
- 3
2828

2929
- name: Keeps neither first nor last
30-
code: keep([1 2 3] "fn(x):\ (x % 2) == 0")
30+
code: keep([1 2 3] \((_ % 2) == 0))
3131
want:
3232
- 2
3333

3434
- name: Keeps strings
3535
code: keep(
3636
qw(apple zebra banana zombies cherimoya zealot)
37-
"fn(x):\ starts?(x, 'z')")
37+
\(starts?(_ 'z')))
3838
want:
3939
- zebra
4040
- zombies
@@ -43,7 +43,7 @@ test::
4343
- name: Keeps lists
4444
code: keep(
4545
[[1 2 3] [5 5 5] [5 1 2] [2 1 2] [1 5 2] [2 2 1] [1 2 5]]
46-
"fn(x):\ has?(x, 5)")
46+
\(has?(_ 5)))
4747
want:
4848
- - 5
4949
- 5
@@ -59,35 +59,35 @@ test::
5959
- 5
6060

6161
- name: Discard on empty list returns empty list
62-
code: discard([] "fn(x):\ true")
62+
code: discard([] \(true))
6363
want: []
6464

6565
- name: Discards everything
66-
code: discard([1 3 5] "fn(x):\ true")
66+
code: discard([1 3 5] \(true))
6767
want: []
6868

6969
- name: Discards nothing
70-
code: discard([1 3 5] "fn(x):\ false")
70+
code: discard([1 3 5] \(false))
7171
want:
7272
- 1
7373
- 3
7474
- 5
7575

7676
- name: Discards first and last
77-
code: discard([1 2 3] "fn(x):\ (x % 2) == 1")
77+
code: discard([1 2 3] \((_ % 2) == 1))
7878
want:
7979
- 2
8080

8181
- name: Discards neither first nor last
82-
code: discard([1 2 3] "fn(x):\ (x % 2) == 0")
82+
code: discard([1 2 3] \((_ % 2) == 0))
8383
want:
8484
- 1
8585
- 3
8686

8787
- name: Discards strings
8888
code: discard(
8989
qw(apple zebra banana zombies cherimoya zealot)
90-
"fn(x):\ starts?(x, 'z')")
90+
\(starts?(_ 'z')))
9191
want:
9292
- apple
9393
- banana
@@ -96,7 +96,7 @@ test::
9696
- name: Discards lists
9797
code: discard(
9898
[[1 2 3] [5 5 5] [5 1 2] [2 1 2] [1 5 2] [2 2 1] [1 2 5]]
99-
"fn(x):\ has?(x, 5)")
99+
\(has?(_ 5)))
100100
want:
101101
- - 1
102102
- 2

0 commit comments

Comments
 (0)