Merge pull request #4 from philburk/noise

Added a new BrownNoise unit generator

5 files changed, 94 insertions, 9 deletions

diff --git a/src/com/jsyn/Synthesizer.java b/src/com/jsyn/Synthesizer.java
index dbf75df..9b7c6c9 100644
--- a/src/com/jsyn/Synthesizer.java
+++ b/src/com/jsyn/Synthesizer.java
@@ -102,13 +102,22 @@ public interface Synthesizer {
 
     public void startUnit(UnitGenerator unit, TimeStamp timeStamp);
 
-    /** Start a unit generator now. */
+    /**
+     * The startUnit and stopUnit methods are mainly for internal use.
+     * Please call unit.start() or unit.stop() instead.
+     * @param unit
+     */
     public void startUnit(UnitGenerator unit);
 
     public void stopUnit(UnitGenerator unit, double time);
 
     public void stopUnit(UnitGenerator unit, TimeStamp timeStamp);
 
+    /**
+     * The startUnit and stopUnit methods are mainly for internal use.
+     * Please call unit.start() or unit.stop() instead.
+     * @param unit
+     */
     public void stopUnit(UnitGenerator unit);
 
     /**
diff --git a/src/com/jsyn/swing/PortControllerFactory.java b/src/com/jsyn/swing/PortControllerFactory.java
index 7387db4..a73d047 100644
--- a/src/com/jsyn/swing/PortControllerFactory.java
+++ b/src/com/jsyn/swing/PortControllerFactory.java
@@ -40,7 +40,7 @@ public class PortControllerFactory {
                 port.set(value);
             }
         });
-        return new DoubleBoundedRangeSlider(rangeModel, 3);
+        return new DoubleBoundedRangeSlider(rangeModel, 4);
     }
 
     public static DoubleBoundedRangeSlider createExponentialPortSlider(final UnitInputPort port) {
@@ -54,7 +54,7 @@ public class PortControllerFactory {
                 port.set(value);
             }
         });
-        return new DoubleBoundedRangeSlider(rangeModel, 3);
+        return new DoubleBoundedRangeSlider(rangeModel, 4);
     }
 
 }
diff --git a/src/com/jsyn/unitgen/BrownNoise.java b/src/com/jsyn/unitgen/BrownNoise.java
new file mode 100644
index 0000000..e70b7f4
--- /dev/null
+++ b/src/com/jsyn/unitgen/BrownNoise.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 1997 Phil Burk, Mobileer Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jsyn.unitgen;
+
+import com.jsyn.ports.UnitInputPort;
+import com.jsyn.ports.UnitOutputPort;
+import com.jsyn.util.PseudoRandom;
+
+/**
+ * BrownNoise unit. This unit uses a pseudo-random number generator to produce a noise related to
+ * Brownian Motion. A DC blocker is used to prevent runaway drift.
+ * 
+ * <pre>
+ * <code>
+ * output = (previous * (1.0 - damping)) + (random * amplitude) 
+ * </code>
+ * </pre>
+ * 
+ * The output drifts quite a bit and will generally exceed the range of +/1 amplitude.
+ * 
+ * @author (C) 1997-2011 Phil Burk, Mobileer Inc
+ * @see WhiteNoise
+ * @see RedNoise
+ * @see PinkNoise
+ */
+public class BrownNoise extends UnitGenerator implements UnitSource {
+    private PseudoRandom randomNum;
+    /** Increasing the damping will effectively increase the cutoff 
+     * frequency of a high pass filter that is used to block DC bias.
+     * Warning: setting this too close to zero can result in very large output values.
+     */
+    public UnitInputPort damping;
+    public UnitInputPort amplitude;
+    public UnitOutputPort output;
+    private double previous;
+
+    public BrownNoise() {
+        randomNum = new PseudoRandom();
+        addPort(damping = new UnitInputPort("Damping"));
+        damping.setup(0.0001, 0.01, 0.1);
+        addPort(amplitude = new UnitInputPort("Amplitude", UnitOscillator.DEFAULT_AMPLITUDE));
+        addPort(output = new UnitOutputPort("Output"));
+    }
+
+    @Override
+    public void generate(int start, int limit) {
+        double[] amplitudes = amplitude.getValues();
+        double[] outputs = output.getValues();
+        double damper = 1.0 - damping.getValues()[0];
+
+        for (int i = start; i < limit; i++) {
+            double r = randomNum.nextRandomDouble() * amplitudes[i];
+            outputs[i] = previous = (damper * previous) + r;
+        }
+    }
+
+    @Override
+    public UnitOutputPort getOutput() {
+        return output;
+    }
+}
diff --git a/src/com/jsyn/unitgen/ExponentialRamp.java b/src/com/jsyn/unitgen/ExponentialRamp.java
index 4befbeb..36159b4 100644
--- a/src/com/jsyn/unitgen/ExponentialRamp.java
+++ b/src/com/jsyn/unitgen/ExponentialRamp.java
@@ -38,6 +38,7 @@ public class ExponentialRamp extends UnitFilter {
 
     public ExponentialRamp() {
         addPort(time = new UnitInputPort("Time"));
+        input.setup(0.0001, 1.0, 1.0);
         addPort(current = new UnitVariablePort("Current", 1.0));
     }
 
diff --git a/src/com/jsyn/util/PseudoRandom.java b/src/com/jsyn/util/PseudoRandom.java
index b7f619c..7fcb1f4 100644
--- a/src/com/jsyn/util/PseudoRandom.java
+++ b/src/com/jsyn/util/PseudoRandom.java
@@ -48,7 +48,7 @@ public class PseudoRandom {
     }
 
     public void setSeed(int seed) {
-        this.seed = ((long) seed) & 0xFFFFFFFF;
+        this.seed = (long) seed;
     }
 
     public int getSeed() {
@@ -76,14 +76,14 @@ public class PseudoRandom {
 
     /** Calculate random 32 bit number using linear-congruential method. */
     public int nextRandomInteger() {
-        long rand = (seed * 196314165) + 907633515;
-        seed = rand & 0x00000000FFFFFFFFL;
-        return (int) rand;
+        // Use values for 64-bit sequence from MMIX by Donald Knuth.
+        seed = (seed * 6364136223846793005L) + 1442695040888963407L;
+        return (int) (seed >> 32); // The higher bits have a longer sequence.
     }
 
     public int choose(int range) {
-        long bigRandom = nextRandomInteger() & 0x7FFFFFFF;
-        long temp = bigRandom * range;
+        long positiveInt = nextRandomInteger() & 0x7FFFFFFF;
+        long temp = positiveInt * range;
         return (int) (temp >> 31);
     }
 }