From 885394f4de541c6fc2bd2261c82f3b6993382d34 Mon Sep 17 00:00:00 2001
From: Siyu Lin <siyul@iastate.edu>
Date: Fri, 18 Apr 2014 21:40:42 -0500
Subject: [PATCH] Modified OnePairEvaluator

---
 homework/bin/hw3/EvaluatorTest.class          | Bin 3866 -> 3697 bytes
 homework/bin/hw3/OnePairEvaluator.class       | Bin 1198 -> 1198 bytes
 homework/bin/hw3/StraightFlushEvaluator.class | Bin 381 -> 2187 bytes
 homework/src/hw3/OnePairEvaluator.java        |   2 --
 homework/src/hw3/StraightFlushEvaluator.java  |   2 +-
 5 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/homework/bin/hw3/EvaluatorTest.class b/homework/bin/hw3/EvaluatorTest.class
index 4a4f496476160b0167d2a3429f82fe45107f10b7..a71f0b88e9793b4459f4ae5b25a565bd630accf9 100644
GIT binary patch
literal 3697
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
U$gT=xXGO^Nijdzk)CT<UFA)DFIRF3v

literal 3866
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

diff --git a/homework/bin/hw3/OnePairEvaluator.class b/homework/bin/hw3/OnePairEvaluator.class
index 8df69c65286bea5f5d87a8652a893ec5f6d75567..908f06e3c9d0f1066a3b860f932728508fd60883 100644
GIT binary patch
delta 63
zcmZ3-xsG$gVJ1e^$w!!M7_}xdGFvhlOtxmWVKf7>MJM+%t1#M3-o)(8=rp;5MSij<
RiwdL1WGfb5Mn5254FDaY5EcLc

delta 63
zcmZ3-xsG$gVJ1ek$w!!M7<DEyGFvhlO}1vXVYC3UMJM+%t1#M4-o)(8=rXy3MSij<
RiwdLHWGfb5#sDB+4FDfo5G4Qr

diff --git a/homework/bin/hw3/StraightFlushEvaluator.class b/homework/bin/hw3/StraightFlushEvaluator.class
index ac9b6c1b4f2526d83163e07cc941e42a88f881f5..101361c108f5a2eac6aa965336d2dcf0fd6241b4 100644
GIT binary patch
literal 2187
zcmc(gT~8B16o%h{mM+Vu2qGWqf{NRUR7Jh8#zYB(CJl)cNtAdoZO86tcen0NQM}fe
znCOlE5wA!z(R+WC@l3nYRoUy_?4Fr<d*(UsoSpvs_4PY|Rou#;k73q%xtcGlfXlk0
zHX5zaS>NZ47FT|dL5g8YuivYLq^PQ+C5C}J(v#{g1$MDm%<eLz*8G|<(T~Alq+v4j
z+j@GeBt5a!aw{U(;gyD9m?-&G-q_`V)Z=I}r5qVD%$JgR3JjTmd(Wj;XJADJ!{J`7
zEMHU3A(y{e<3Vkk*4sN5Gnk^ypYeU3Z*Z@kUk?I5Ffh&V_MsPu&~NOEnpO4PrfhH}
zea~tJKJmD>Epu?k5tce=3hQ`hEVmUZOS(;x3r|^!<kE9QAQk20kz1B4l;hW|;*o7D
ze}L_*X<`yH+NoJG*)DZKX-lfGpuHQa3w2+FYLn_@n6~#yyead#&O){w>V<-VvkV`5
zS5yqr)@*xEvUK_;P3zO3S_~{Oyz41oL_)q3Sv3$`iH@l=aZ~q-f7yDG;dAe(yOfcu
z%hY2kGPlaTGIeeE^nhVBUPAV<fh@y^9&#U{#kygnN{tb2ix({!h?;?AhWEWhjKQ>f
zB17G}#a+5dChhG1AESY*3~zb|9MQE=$MxB_DxpwO2N+mo_|!YNe|ciZZkGL4P!$_e
z-}`gNU#2Vi>cax)+NS>{V349T2I!fg(F1y?=$+0T!uUc#ABN~@(i>Q!r5uJS%5_8-
z!6=PLjxmhWPjz&HBCSqif};L$Ml&a)^oz8qR+-;0`Do(QAx{6G5#7A>)Cj-~>E|#X
z)9YLv{h0*)xrF>yf_@R_WBIiWo%|OP^h>xD(|3971br@n=W>Gn3RYtIyZ+=8^w$!2
Pt{<nT%r~gQKHU5bwuoOa

delta 60
zcmeAc{L933>ff$?3=9m$45AacR0RdH63Y_xa}x8?_5G8wQj<$2y3U`R%VxsJIC&9U
PJQo8agD_Ar6N3l<R&Nl8

diff --git a/homework/src/hw3/OnePairEvaluator.java b/homework/src/hw3/OnePairEvaluator.java
index c3cc621..171b3ef 100644
--- a/homework/src/hw3/OnePairEvaluator.java
+++ b/homework/src/hw3/OnePairEvaluator.java
@@ -34,13 +34,11 @@ public class OnePairEvaluator implements IEvaluator
 
 @Override
 public String getName() {
-	// TODO Auto-generated method stub
 	return "One Pair";
 }
 
 @Override
 public int getRanking() {
-	// TODO Auto-generated method stub
 	return ranking;
 }
 
diff --git a/homework/src/hw3/StraightFlushEvaluator.java b/homework/src/hw3/StraightFlushEvaluator.java
index 05fc05c..f30b401 100644
--- a/homework/src/hw3/StraightFlushEvaluator.java
+++ b/homework/src/hw3/StraightFlushEvaluator.java
@@ -22,7 +22,7 @@ import api.Suit;
  */
 //Note: You must edit this declaration to extend AbstractEvaluator
 //or to extend some other class that extends AbstractEvaluator
-public class StraightFlushEvaluator
+public class StraightFlushEvaluator extends AbstractEvaluator
 {
   /**
    * Constructs the evaluator. Note that the maximum rank of
-- 
GitLab