Commits · f2c64f7f8b42a930776ccb81712f6b5a9306b83e · Siyu Lin / Homework

Apr 23, 2014

Delete redundant spaces · f2c64f7f
Siyu Lin authored 10 years ago

f2c64f7f
Import project · f12e2946
Siyu Lin authored 10 years ago

f12e2946
lab11 Recursion · fa3a1d1e
Siyu Lin authored 10 years ago

fa3a1d1e
Finish OnePairEvaluator · 314c7aed
Siyu Lin authored 10 years ago

314c7aed

Merge branch 'master' of ssh://pyrite.cs.iastate.edu/~/cs227/workspace · a065dc5c

Siyu Lin authored 10 years ago

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/26/502cda1668c7001316e2eb0225b97719
	.metadata/.plugins/org.eclipse.core.resources/.history/ee/0019d30e30c70013122a860e25993110
	.metadata/.plugins/org.eclipse.core.resources/.history/ff/c0e1d9334fc600131ac1df1f51fe8df4
	.metadata/.plugins/org.eclipse.core.resources/.projects/exam1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.indexes/e4/4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/project10/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project6/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project8/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/temp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.core/.launches/SubsetFinder.launch
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties

a065dc5c

Merge All · 93d480b4
Siyu Lin authored 10 years ago

93d480b4
Finish OnePairEvaluator · d9706f78
Siyu Lin authored 10 years ago

d9706f78

Apr 22, 2014

Merge branch 'master' of github.com:fishleen/workspace · 9fee917a
Siyu Lin authored 10 years ago

9fee917a
createHand writing · cff67e8b
Siyu Lin authored 10 years ago

cff67e8b

Merge branch 'master' of ../workspace · 548b9df8

Siyu Lin authored 10 years ago

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/exam1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.indexes/e4/4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project10/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project6/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project8/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/temp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties

548b9df8

Merge Conflict · 3ba92918
Siyu Lin authored 10 years ago

3ba92918
Resolving conflict · cb4aea88
Siyu Lin authored 10 years ago

cb4aea88
Resolving conflict · b2b72df1
Siyu Lin authored 10 years ago

b2b72df1
Avoiding overwritten of metadata · 11f27784
Siyu Lin authored 10 years ago

11f27784
OnePairEvaluator creatHand pseudocode added · 7a6be694
Siyu Lin authored 10 years ago

7a6be694
Merge Conflict · ae41a59c
Siyu Lin authored 10 years ago

ae41a59c
Modified AbstractEvaluator Class and canSatisfy method in OnePairEvaluator · 9ba7b382
Siyu Lin authored 10 years ago

9ba7b382

Apr 19, 2014
- Modified OnePairEvaluator · 885394f4
  Siyu Lin authored 10 years ago
  
  885394f4
- Commit homewokr · abb75435
  Siyu Lin authored 10 years ago
  
  abb75435
- Commit unstatged homework · 03b5e275
  Siyu Lin authored 10 years ago
  
  03b5e275
- Commit the Evaluator Test · b5c13b64
  Siyu Lin authored 10 years ago
  
  b5c13b64
- Modified CatchAllEvaluator · bf57f8b8
  Siyu Lin authored 10 years ago
  
  bf57f8b8
- Modified CatchAllEvaluator · 32025618
  Siyu Lin authored 10 years ago
  
  32025618
- OnePairEvaluator implements IEvaluator temporarily without extending AbstractEvaluator Class · b30c98f1
  Siyu Lin authored 10 years ago
  
  b30c98f1
Apr 18, 2014
- Added checkGetBestHand and cards array resorted · 277d747a
  Siyu Lin authored 10 years ago
  
  277d747a
Apr 17, 2014

Workbench for Eclipse · fc5fcc7b
Siyu Lin authored 10 years ago

fc5fcc7b
EvaluatorTest Updated · 85e5460f
Siyu Lin authored 10 years ago

85e5460f
Start writing EvaluatorTest for OnePair Evaluator · 1b90e255
Siyu Lin authored 10 years ago

1b90e255
Add Untracked File From Mac · 38b7523e
Siyu Lin authored 10 years ago

38b7523e
Add Untracked Fill · 715dbcb6
Siyu Lin authored 10 years ago

715dbcb6
Merge Conflict · 4d06f2b1
Siyu Lin authored 10 years ago

4d06f2b1
Merge Conflict · 825518d2
Siyu Lin authored 10 years ago

825518d2
Add Tracked File · 3fe4ee04
Siyu Lin authored 10 years ago

3fe4ee04
I am too full today · 91459c0c
Siyu Lin authored 10 years ago

91459c0c
Merge branch 'master' of ../workspace · c188cbc9
Siyu Lin authored 10 years ago
```
Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
```
c188cbc9
Solve Workbench · d5d48081
Siyu Lin authored 10 years ago

d5d48081
IEvaluator changed · 717b4037
Siyu Lin authored 10 years ago

717b4037
IEvaluator changed · 6396c957
Siyu Lin authored 10 years ago

6396c957

Merge branch 'master' of ../workspace · f8d7ac67

Siyu Lin authored 10 years ago

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/exam1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/homework/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project10/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project6/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project7/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/project8/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/temp/.markers
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

f8d7ac67

Eclipse Merge · e726a021
Siyu Lin authored 10 years ago

e726a021