summary refs log tree commit diff stats
path: root/lib
diff options
context:
space:
mode:
authorJosep Sanjuas <jsanjuas@gmail.com>2015-04-12 19:40:30 +0200
committerJosep Sanjuas <jsanjuas@gmail.com>2015-04-12 19:40:30 +0200
commitd0ff06b8c14e3b505d0c14ca5c9c37e8b667c875 (patch)
tree42b258749d641870306699ab1388b54408d189a8 /lib
parent28ecf72f79efa55f48b4ecd7cbe4ca29ccaa0f95 (diff)
downloadNim-d0ff06b8c14e3b505d0c14ca5c9c37e8b667c875.tar.gz
Generalize mean to other types
Diffstat (limited to 'lib')
-rw-r--r--lib/pure/math.nim7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pure/math.nim b/lib/pure/math.nim
index aa64933fb..0051c9d88 100644
--- a/lib/pure/math.nim
+++ b/lib/pure/math.nim
@@ -114,10 +114,13 @@ proc sum*[T](x: openArray[T]): T {.noSideEffect.} =
   ## If `x` is empty, 0 is returned.
   for i in items(x): result = result + i
 
-proc mean*(x: openArray[float]): float {.noSideEffect.} = 
+template toFloat(f: float): float = f
+
+proc mean*[T](x: openArray[T]): float {.noSideEffect.} =
   ## computes the mean of the elements in `x`. 
   ## If `x` is empty, NaN is returned.
-  result = sum(x) / toFloat(len(x))
+  ## ``toFloat(x: T): float`` must be defined.
+  result = toFloat(sum(x)) / toFloat(len(x))
 
 proc variance*(x: openArray[float]): float {.noSideEffect.} = 
   ## computes the variance of the elements in `x`. 
88c9f778'>732b4012 ^
8f50c004 ^
f1a454b0 ^
732b4012 ^
8f50c004 ^
732b4012 ^
8f50c004 ^
a35042fb ^
b4c2c703 ^
b6aff4c3 ^
bd0ede8d ^
cc952d63 ^
871c502d ^
23236d0c ^


cc952d63 ^
58c84bd6 ^


845bd407 ^
13c70add ^
6d4dddc7 ^
0e2b3164 ^
035a39a8 ^

f61767b1 ^
c3cdeb9c ^
f54d0ec7 ^

09449df0 ^

845bd407 ^


2052eb74 ^


cc952d63 ^

23236d0c ^
cc952d63 ^


23236d0c ^
d46a05a8 ^
ea87d005 ^
cc952d63 ^
c9c7a833 ^
cc952d63 ^
a44749f6 ^
23236d0c ^
cc952d63 ^
a44749f6 ^
23236d0c ^
bea16f4e ^
23236d0c ^

cc952d63 ^
d46a05a8 ^
1b0786f2 ^



d46a05a8 ^
1b0786f2 ^

bd0ede8d ^
1b0786f2 ^


d46a05a8 ^

845bd407 ^




d46a05a8 ^
23236d0c ^

a7772cc6 ^
cc952d63 ^
23236d0c ^
d46a05a8 ^
23236d0c ^


cc952d63 ^
23236d0c ^

871c502d ^
cc952d63 ^
a7772cc6 ^
23236d0c ^
d46a05a8 ^
23236d0c ^







9341b0d6 ^
3bd534c9 ^


7ae16892 ^

3bd534c9 ^
7ae16892 ^




3bd534c9 ^
7ae16892 ^


23236d0c ^
d46a05a8 ^
23236d0c ^




ea87d005 ^
d46a05a8 ^
845bd407 ^






ea87d005 ^
d46a05a8 ^
845bd407 ^






ea87d005 ^
d46a05a8 ^
845bd407 ^

845bd407 ^
a7772cc6 ^

748d0a6a ^
a5e1ccdd ^

















748d0a6a ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214