"'+game.rule.describe(),function(){ + event.preventDefault(); + // ObjectStorage.clear(); + // $window.location.reload(true); /// reloads are better for ads? + game.reset(); + // since this confirmation was away from the dom we need to + // manually refresh + $scope.$apply(); + }); },function(){} ); }; diff --git a/src/js/game.js b/src/js/game.js index 33a3c09..96bbc45 100644 --- a/src/js/game.js +++ b/src/js/game.js @@ -88,12 +88,25 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, this.dealHand(); - // deal first card - // TODO make sure these follow rule - - // deal new initial cards + // deal new initial cards that follow the rule this.lastCards.splice(0,this.lastCards.length); - this.lastCards.push.apply(this.lastCards,_.sampleSize(this.cards,3)); + this.lastCards.push(_.sample(this.cards)); + for (var i = 0; i < 52; i++) { + if (this.lastCards.length>2) break; // stop here + var card = _.sample(this.cards); + var res; + try{ + res = this.rule.test(card,this.lastCards,this.cards); + } catch(e){ + // in case of an error just add a random card + // this is probobly because it is looking back 2 or 3 cards + // yet we only have 1 + this.lastCards.push(_.sample(this.cards)); + } + if (res) this.lastCards.push(_.sample(this.cards)); + } + if (this.lastCards.length<3) console.error('Could not deal cards for rule',this.rule.key,this.rule.options); + // this.lastCards.push.apply(this.lastCards,_.sampleSize(this.cards,3)); this.ruleInfo.splice(0,this.ruleInfo.length); this.hints.splice(0,this.hints.length); @@ -151,9 +164,12 @@ var Game = module.exports =(function (Helpers, GameObjects, ObjectStorage,Rules, }; Game.prototype.newRule = function () { + // FIXME var okRules = _.filter(ruleSimulations,function(s){ return s.ratioRight>0.1&&s.ratioRight<0.6; }); + // var okRules = this.rules; + // _.map(this.rules,function(r){return r.randomize();}); // choose and ok rule var ruleConfig = _.sample(okRules); // now find the rule and set these options diff --git a/src/js/rules.js b/src/js/rules.js index bf874c2..2eebd45 100644 --- a/src/js/rules.js +++ b/src/js/rules.js @@ -190,6 +190,7 @@ var Rules = module.exports = (function functionName(_,chai) { } return s; }; + /** Get next hint **/ Rule.prototype.nextHint = function () { var hint = this.hints[this.state.hintsUsed]; @@ -304,7 +305,66 @@ var Rules = module.exports = (function functionName(_,chai) { function (state) { $.extend(this.state, state); }; + Rule.prototype.simulateOne = function (options,cards,n) { + if (!n) n=52*2; + var t0=new Date(); + var rights=[]; + var wrongs=[]; + var errors=[]; + var lastCards = _.sampleSize(cards,3); + this.setOptions(options); + for (var i = 0; i < n; i++) { + var res=undefined; + var error=undefined; + var card = _.sample(cards); + try{ + var res = this.testAndTell(card,lastCards,cards); + } catch(e){ + error=e; + } + + if (error){ + errors.push(error.message); + } else if (res.result){ + rights.push(res.result); + } else { + if (res.reason&&res.reason.message){ + wrongs.push(res.reason.message); + } else if (res.reason){ + wrongs.push(res.reason); + } else { + wrongs.push(res); + } + } + } + var ratioRight = rights.length/(rights.length+wrongs.length); + var ok = ratioRight>0.1&&ratioRight<0.66; + return { + wrongs:wrongs, + wrong:wrongs.length, + right:rights.length, + rights:rights, + error:errors.length, + errors:errors, + key:this.key, + description:this.describe(), + options:this.options, + n:n, + time:new Date()-t0, + ok:ok, + ratioRight:_.round(ratioRight,4), + + }; + }; + Rule.prototype.simulate = function (cards) { + var results = []; + for (var i = 0; i < this.optionsPossible.length; i++) { + var res = this.simulateOne(this.optionsPossible[i],cards); + results.push(res); + } + return results; + }; // Now defined actual rules var rules = []; diff --git a/src/js/rules/simulate.html b/src/js/rules/simulate.html new file mode 100644 index 0000000..00f553b --- /dev/null +++ b/src/js/rules/simulate.html @@ -0,0 +1,66 @@ + + +