summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornfoy <nfoy@purdue.edu>2014-04-22 17:35:01 -0400
committernfoy <nfoy@purdue.edu>2014-04-22 17:35:01 -0400
commit7fe1f6a809d68648bede431b84692bf7d8bb0c01 (patch)
treed75a3ee63895dd4086a44ca765ace85f6311386f
parent0dcb7c84e27217f27d0c7d6cddf147bed0c37cc2 (diff)
parent72c938c505e6c159d824c6d555779fe1a9eba071 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
-rw-r--r--lib/scoring/.FibonacciPeerWithBlowout.rb.swpbin0 -> 12288 bytes
-rw-r--r--lib/scoring/FibonacciPeerWithBlowout.rb (renamed from lib/scoring_algorithms/FibonacciPeerWithBlowout.rb)0
-rw-r--r--lib/scoring/MarginalPeer.rb (renamed from lib/scoring_algorithms/MarginalPeer.rb)0
-rw-r--r--lib/scoring/ScoringAlgorithm.rb (renamed from lib/scoring_algorithms/ScoringAlgorithm.rb)0
-rw-r--r--lib/scoring/WinnerTakesAll.rb (renamed from lib/scoring_algorithms/WinnerTakesAll.rb)0
5 files changed, 0 insertions, 0 deletions
diff --git a/lib/scoring/.FibonacciPeerWithBlowout.rb.swp b/lib/scoring/.FibonacciPeerWithBlowout.rb.swp
new file mode 100644
index 0000000..49504ab
--- /dev/null
+++ b/lib/scoring/.FibonacciPeerWithBlowout.rb.swp
Binary files differ
diff --git a/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb b/lib/scoring/FibonacciPeerWithBlowout.rb
index 19ac9a7..19ac9a7 100644
--- a/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb
+++ b/lib/scoring/FibonacciPeerWithBlowout.rb
diff --git a/lib/scoring_algorithms/MarginalPeer.rb b/lib/scoring/MarginalPeer.rb
index 0e1cfa8..0e1cfa8 100644
--- a/lib/scoring_algorithms/MarginalPeer.rb
+++ b/lib/scoring/MarginalPeer.rb
diff --git a/lib/scoring_algorithms/ScoringAlgorithm.rb b/lib/scoring/ScoringAlgorithm.rb
index 6277da8..6277da8 100644
--- a/lib/scoring_algorithms/ScoringAlgorithm.rb
+++ b/lib/scoring/ScoringAlgorithm.rb
diff --git a/lib/scoring_algorithms/WinnerTakesAll.rb b/lib/scoring/WinnerTakesAll.rb
index ad2471b..ad2471b 100644
--- a/lib/scoring_algorithms/WinnerTakesAll.rb
+++ b/lib/scoring/WinnerTakesAll.rb