window.model no longer

play/js/Election.js

@@ -1088,7 +1088,7 @@ Election.rbvote = function(model, options){ // Use the RBVote from Rob Legrand
 	var ballots = model.getBallots();
 
 	rbvote.setreturnstring() // tell rbvote that we might want return strings (unless we're not doing the sidebar)
-	rbvote.readballots(ballots)
+	rbvote.readballots(ballots,model)
 	resultRB = model.rbelection(options.sidebar) // e.g. result = rbvote.calctide() // having a sidebar display means we want to construct explanation strings
 
 

play/js/Voters.js

@@ -174,9 +174,9 @@ function utility_function(utility_shape) {
 }
 
 function inverse_utility_function(utility_shape) {
-	if (model.utility_shape == "quadratic") {
+	if (utility_shape == "quadratic") {
 		var finv = x => Math.sqrt(x)
-	} else if (model.utility_shape == "log") {
+	} else if (utility_shape == "log") {
 		var finv = x => Math.exp(x) - .1
 	} else { // "linear"
 		var finv = x => x

play/js/main_sandbox.js

@@ -61,6 +61,7 @@ function Sandbox() {
     var maxVoters = 10  // workaround  // there is a bug where the real max is one less than this
 
     // CREATE
+    var model = new Model();
     var ui = {}
     var config
 	var initialConfig

rbvote/rbvote.js

@@ -2626,7 +2626,7 @@ function readvotes()
 }
 
 
-function readballots(ballots)
+function readballots(ballots,model)
 {
    var absent, beat = new Array(), i, ignoreinput, j, k, l, nextcand, rating = new Array(), regexp = new RegExp(), rvotecomment, rvoteinput,
        rvoteline = new Array(), tiebreakinput;