improved set selection algorithm

1 files changed, 20 insertions, 3 deletions

diff --git a/window.py b/window.py
index d062ad2..8f34683 100644
--- a/window.py
+++ b/window.py
@@ -1,5 +1,6 @@
 #Copyright (c) 2009, Walter Bender
 #Copyright (c) 2009, Michele Pratusevich
+#Copyright (c) 2009, Vincent Le
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -200,9 +201,24 @@ def set_check(cardarray):
    for a in cardarray:
        if a is None:
            return False
-       else:
-           break
-
+       # else:
+           # break
+
+   if (cardarray[0].num + cardarray[1].num + cardarray[2].num)%3 != 0:
+      return False
+   if (cardarray[0].fill + cardarray[1].fill + cardarray[2].fill)%3 != 0:
+      return False
+   if (cardarray[0].shape + cardarray[1].shape + cardarray[2].shape)%3 != 0:
+      return False
+   if cardarray[0].color == cardarray[1].color and \
+      cardarray[1].color != cardarray[2].color:
+      return False
+   if cardarray[0].color != cardarray[1].color and \
+      cardarray[1].color != cardarray[2].color and \
+      cardarray[0].color == cardarray[2].color:
+      return False
+   return True
+   """
    if (cardarray[0].num == cardarray[1].num):
        if (cardarray[1].num != cardarray[2].num):
            return False
@@ -231,3 +247,4 @@ def set_check(cardarray):
        if (cardarray[1].shape == cardarray[2].shape):
            return False
    return True
+   """