pick method can be applied to durations as well. Added a weight funct…

…ion to provide weights for random distribution to picking

js/gibber/sequence.js

@@ -202,10 +202,27 @@ Seq.prototype = {
 				shouldReturn = true;
 
 				// only use duration with negative offset
-				if(this.offset < 0)
-					nextPhase += (this.durations != null) ? this.durations[this.durationCounter % this.durations.length] : this.speed;
+				if(this.offset < 0) {
+					if(this.durations != null) {
+						if(this.durations.pick != null) {
+							nextPhase += this.durations.pick();
+						}else{
+							nextPhase +=this.durations[this.durationCounter % this.durations.length]
+						}
+					}else{
+						nextPhase += this.speed;
+					}
+				}
 			}else{
-				nextPhase += (this.durations != null) ? this.durations[this.durationCounter % this.durations.length] : this.speed;
+				if(this.durations != null) {
+					if(this.durations.pick != null) {
+						nextPhase += this.durations.pick();
+					}else{
+						nextPhase += this.durations[this.durationCounter % this.durations.length]
+					}
+				}else{
+					nextPhase += this.speed;
+				}
 			}
 			// TODO: should this flip-flop between floor and ceiling instead of rounding?
 			nextPhase = Math.round(nextPhase);

js/gibber/utilities.js

@@ -216,6 +216,32 @@ window.rndf = 	window.randomf = function(min, max) {
 	return min + rr;
 }
 
+/* returns function that randomly picks from an array using the provided weights. Example:
+a = [1,2,3,4]
+a.pick = weight([.5,.25,.1,.15])
+a.pick();
+
+TODO: Figure out an algorithm(s) to automatically create weights with different schemes
+*/
+window.weight = function(weights) {
+    var w = weights;
+    var returnValue = this[0];
+    function pick() {
+        var total = 0;
+        var r = rndf();
+        for(var i = 0; i < w.length; i++) {
+            total += w[i];
+            if(r < total) { 
+                returnValue = this[i];
+                break;
+            }
+        }
+        return returnValue;
+    }
+
+    return pick;
+}
+
 window.getSpeed = function(div) {
 	return window["_"+div];
 };