Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a678c47f
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a678c47f
编写于
4月 30, 2016
作者:
K
Kenta Murata
提交者:
Jeremy Daer
4月 30, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix initial value effects for sum along to ruby 2.4
Signed-off-by:
N
Jeremy Daer
<
jeremydaer@gmail.com
>
上级
46e0666b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
85 addition
and
5 deletion
+85
-5
activesupport/lib/active_support/core_ext/enumerable.rb
activesupport/lib/active_support/core_ext/enumerable.rb
+7
-5
activesupport/test/core_ext/enumerable_test.rb
activesupport/test/core_ext/enumerable_test.rb
+78
-0
未找到文件。
activesupport/lib/active_support/core_ext/enumerable.rb
浏览文件 @
a678c47f
...
...
@@ -17,11 +17,12 @@ module Enumerable
# The default sum of an empty list is zero. You can override this default:
#
# [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
def
sum
(
identity
=
0
,
&
block
)
def
sum
(
identity
=
nil
,
&
block
)
if
block_given?
map
(
&
block
).
sum
(
identity
)
else
inject
(:
+
)
||
identity
sum
=
identity
?
inject
(
identity
,
:
+
)
:
inject
(:
+
)
sum
||
identity
||
0
end
end
...
...
@@ -91,15 +92,16 @@ def pluck(*keys)
class
Range
#:nodoc:
# Optimize range sum to use arithmetic progression if a block is not given and
# we have a range of numeric values.
def
sum
(
identity
=
0
)
def
sum
(
identity
=
nil
)
if
block_given?
||
!
(
first
.
is_a?
(
Integer
)
&&
last
.
is_a?
(
Integer
))
super
else
actual_last
=
exclude_end?
?
(
last
-
1
)
:
last
if
actual_last
>=
first
(
actual_last
-
first
+
1
)
*
(
actual_last
+
first
)
/
2
sum
=
identity
||
0
sum
+
(
actual_last
-
first
+
1
)
*
(
actual_last
+
first
)
/
2
else
identity
identity
||
0
end
end
end
...
...
activesupport/test/core_ext/enumerable_test.rb
浏览文件 @
a678c47f
...
...
@@ -22,6 +22,11 @@ def each
end
end
def
assert_typed_equal
(
e
,
v
,
cls
,
msg
=
nil
)
assert_kind_of
(
cls
,
v
,
msg
)
assert_equal
(
e
,
v
,
msg
)
end
def
test_sums
enum
=
GenericEnumerable
.
new
([
5
,
15
,
10
])
assert_equal
30
,
enum
.
sum
...
...
@@ -38,6 +43,40 @@ def test_sums
payments
=
GenericEnumerable
.
new
([
SummablePayment
.
new
(
5
),
SummablePayment
.
new
(
15
)
])
assert_equal
SummablePayment
.
new
(
20
),
payments
.
sum
assert_equal
SummablePayment
.
new
(
20
),
payments
.
sum
{
|
p
|
p
}
sum
=
GenericEnumerable
.
new
([
3
,
5
.
quo
(
1
)]).
sum
assert_typed_equal
(
8
,
sum
,
Rational
)
sum
=
GenericEnumerable
.
new
([
3
,
5
.
quo
(
1
)]).
sum
(
0.0
)
assert_typed_equal
(
8.0
,
sum
,
Float
)
sum
=
GenericEnumerable
.
new
([
3
,
5
.
quo
(
1
),
7.0
]).
sum
assert_typed_equal
(
15.0
,
sum
,
Float
)
sum
=
GenericEnumerable
.
new
([
3
,
5
.
quo
(
1
),
Complex
(
7
)]).
sum
assert_typed_equal
(
Complex
(
15
),
sum
,
Complex
)
assert_typed_equal
(
15
,
sum
.
real
,
Rational
)
assert_typed_equal
(
0
,
sum
.
imag
,
Integer
)
sum
=
GenericEnumerable
.
new
([
3.5
,
5
]).
sum
assert_typed_equal
(
8.5
,
sum
,
Float
)
sum
=
GenericEnumerable
.
new
([
2
,
8.5
]).
sum
assert_typed_equal
(
10.5
,
sum
,
Float
)
sum
=
GenericEnumerable
.
new
([
1
.
quo
(
2
),
1
]).
sum
assert_typed_equal
(
3
.
quo
(
2
),
sum
,
Rational
)
sum
=
GenericEnumerable
.
new
([
1
.
quo
(
2
),
1
.
quo
(
3
)]).
sum
assert_typed_equal
(
5
.
quo
(
6
),
sum
,
Rational
)
sum
=
GenericEnumerable
.
new
([
2.0
,
3.0
*
Complex
::
I
]).
sum
assert_typed_equal
(
Complex
(
2.0
,
3.0
),
sum
,
Complex
)
assert_typed_equal
(
2.0
,
sum
.
real
,
Float
)
assert_typed_equal
(
3.0
,
sum
.
imag
,
Float
)
sum
=
GenericEnumerable
.
new
([
1
,
2
]).
sum
(
10
)
{
|
v
|
v
*
2
}
assert_typed_equal
(
16
,
sum
,
Integer
)
end
def
test_nil_sums
...
...
@@ -55,6 +94,7 @@ def test_empty_sums
assert_equal
0
,
GenericEnumerable
.
new
([]).
sum
assert_equal
0
,
GenericEnumerable
.
new
([]).
sum
{
|
i
|
i
+
10
}
assert_equal
Payment
.
new
(
0
),
GenericEnumerable
.
new
([]).
sum
(
Payment
.
new
(
0
))
assert_typed_equal
0.0
,
GenericEnumerable
.
new
([]).
sum
(
0.0
),
Float
end
def
test_range_sums
...
...
@@ -68,6 +108,10 @@ def test_range_sums
assert_equal
5
,
(
10
..
0
).
sum
(
5
)
assert_equal
10
,
(
10
..
10
).
sum
assert_equal
42
,
(
10
...
10
).
sum
(
42
)
assert_typed_equal
20.0
,
(
1
..
4
).
sum
(
0.0
)
{
|
i
|
i
*
2
},
Float
assert_typed_equal
10.0
,
(
1
..
4
).
sum
(
0.0
),
Float
assert_typed_equal
20.0
,
(
1
..
4
).
sum
(
10.0
),
Float
assert_typed_equal
5.0
,
(
10
..
0
).
sum
(
5.0
),
Float
end
def
test_array_sums
...
...
@@ -86,6 +130,40 @@ def test_array_sums
payments
=
[
SummablePayment
.
new
(
5
),
SummablePayment
.
new
(
15
)
]
assert_equal
SummablePayment
.
new
(
20
),
payments
.
sum
assert_equal
SummablePayment
.
new
(
20
),
payments
.
sum
{
|
p
|
p
}
sum
=
[
3
,
5
.
quo
(
1
)].
sum
assert_typed_equal
(
8
,
sum
,
Rational
)
sum
=
[
3
,
5
.
quo
(
1
)].
sum
(
0.0
)
assert_typed_equal
(
8.0
,
sum
,
Float
)
sum
=
[
3
,
5
.
quo
(
1
),
7.0
].
sum
assert_typed_equal
(
15.0
,
sum
,
Float
)
sum
=
[
3
,
5
.
quo
(
1
),
Complex
(
7
)].
sum
assert_typed_equal
(
Complex
(
15
),
sum
,
Complex
)
assert_typed_equal
(
15
,
sum
.
real
,
Rational
)
assert_typed_equal
(
0
,
sum
.
imag
,
Integer
)
sum
=
[
3.5
,
5
].
sum
assert_typed_equal
(
8.5
,
sum
,
Float
)
sum
=
[
2
,
8.5
].
sum
assert_typed_equal
(
10.5
,
sum
,
Float
)
sum
=
[
1
.
quo
(
2
),
1
].
sum
assert_typed_equal
(
3
.
quo
(
2
),
sum
,
Rational
)
sum
=
[
1
.
quo
(
2
),
1
.
quo
(
3
)].
sum
assert_typed_equal
(
5
.
quo
(
6
),
sum
,
Rational
)
sum
=
[
2.0
,
3.0
*
Complex
::
I
].
sum
assert_typed_equal
(
Complex
(
2.0
,
3.0
),
sum
,
Complex
)
assert_typed_equal
(
2.0
,
sum
.
real
,
Float
)
assert_typed_equal
(
3.0
,
sum
.
imag
,
Float
)
sum
=
[
1
,
2
].
sum
(
10
)
{
|
v
|
v
*
2
}
assert_typed_equal
(
16
,
sum
,
Integer
)
end
def
test_index_by
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录