Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7407a45

Browse files
committedMar 17, 2017
Change "Generator" to "Task".
1 parent 9d4bafb commit 7407a45

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed
 

Diff for: ‎src/Games.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ export Player, NormalFormGame, # Types
5050
worst_values, outerapproximation,
5151

5252
# Support Enumeration
53-
support_enumeration, support_enumeration_gen
53+
support_enumeration, support_enumeration_task
5454

5555
end # module

Diff for: ‎src/support_enumeration.jl

+11-11
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ minus 1 such pairs. This should thus be used only for small games.
2929
"""
3030
function support_enumeration(g::NormalFormGame)
3131

32-
task = support_enumeration_gen(g)
32+
task = support_enumeration_task(g)
3333

3434
NEs = Tuple{Vector{Float64},Vector{Float64}}[NE for NE in task]
3535

@@ -38,34 +38,34 @@ function support_enumeration(g::NormalFormGame)
3838
end
3939

4040
"""
41-
support_enumeration_gen(g::NormalFormGame)
41+
support_enumeration_task(g::NormalFormGame)
4242
43-
Generator version of `support_enumeration`.
43+
Task version of `support_enumeration`.
4444
4545
# Arguments
4646
* `g::NormalFormGame`: NormalFormGame instance.
4747
4848
# Returns
4949
* `::Task`: runnable task for generating Nash equilibria.
5050
"""
51-
function support_enumeration_gen(g::NormalFormGame)
51+
function support_enumeration_task(g::NormalFormGame)
5252

5353
N = length(g.nums_actions)
5454
if N != 2
5555
throw(ArgumentError("Implemented only for 2-player games"))
5656
end
5757

58-
task = Task(() -> _support_enumeration_gen(g.players[1].payoff_array,
59-
g.players[2].payoff_array))
58+
task = Task(() -> _support_enumeration_task(g.players[1].payoff_array,
59+
g.players[2].payoff_array))
6060

6161
return task
6262
end
6363

6464
"""
65-
_support_enumeration_gen{T<:Real}(payoff_matrix1::Matrix{T},
66-
payoff_matrix2::Matrix{T})
65+
_support_enumeration_task{T<:Real}(payoff_matrix1::Matrix{T},
66+
payoff_matrix2::Matrix{T})
6767
68-
Main body of `support_enumeration_gen`.
68+
Main body of `support_enumeration_task`.
6969
7070
# Arguments
7171
* `payoff_matrix1::Matrix{T}`: Payoff matrix of player 1.
@@ -75,8 +75,8 @@ Main body of `support_enumeration_gen`.
7575
* `Tuple{Vector{Float64},Vector{Float64}}`: Tuple of Nash equilibrium
7676
mixed actions.
7777
"""
78-
function _support_enumeration_gen{T<:Real}(payoff_matrix1::Matrix{T},
79-
payoff_matrix2::Matrix{T})
78+
function _support_enumeration_task{T<:Real}(payoff_matrix1::Matrix{T},
79+
payoff_matrix2::Matrix{T})
8080

8181
nums_actions = size(payoff_matrix1, 1), size(payoff_matrix2, 1)
8282
n_min = min(nums_actions...)

0 commit comments

Comments
 (0)
Please sign in to comment.