Initial Commit

rasdasd · Dec 1, 2015 · 5b18dfd · 5b18dfd
1 parent 15d28c5
commit 5b18dfd
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 18 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -87,8 +87,8 @@
     <orderEntry type="library" exported="" name="commons-math3-3.5" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="JTransforms-3.1" level="project" />
     <orderEntry type="library" exported="" name="JLargeArrays-1.5" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
diff --git a/app/src/main/java/rasdasd/com/handstodrums/AccellerationActivity.java b/app/src/main/java/rasdasd/com/handstodrums/AccellerationActivity.java
@@ -36,12 +36,12 @@ public class AccellerationActivity extends Activity {
     private int counter = -1;
     private int fftcounter = -1;
     private int maxSizeGraph = 100;
-    private int fftsize = 10;
+    private int fftsize = 20;
     private BarChart fftchart;
     private FloatFFT_1D fft;
     private int a = 0;
     private float threshold = 8;
-    private long threshdelay = 300;
+    private long threshdelay = 500;
     private boolean drawDisplay = false;
     private ToggleButton graphB, bassB, floorB, mountB, snareB, resetB;
     private TextView bassT, floorT, mountT, snareT;
@@ -162,6 +162,10 @@ private void manipData() {
         fft.complexForward(xarrfft);
         fft.complexForward(yarrfft);
         fft.complexForward(zarrfft);
+        if (System.currentTimeMillis() - lastplayed < threshdelay) {
+            return;
+        }
+        lastplayed = System.currentTimeMillis();
         if (!learned)
             addpoint(xarr, yarr, zarr, xarrfft, yarrfft, zarrfft);
         else
@@ -180,7 +184,6 @@ public void trainingTime(View v) {
             snareB.setChecked(false);
             for(Holder h : holderArray) {
                 h.train();
-                break;
             }
             learned = true;
             bassC = 0;
@@ -196,10 +199,6 @@ public void trainingTime(View v) {
     }
     long lastplayed = 0;
     private void classifyPoint(float[] xarr, float[] yarr, float[] zarr, float[] xarrfft, float[] yarrfft, float[] zarrfft) {
-        if (System.currentTimeMillis() - lastplayed < threshdelay) {
-            return;
-        }
-        lastplayed = System.currentTimeMillis();
         float[] datapoint = new float[fftsize * 9];
         float abssum = 0;
         for (int i = 0; i < fftsize * 2; i++) {
@@ -231,10 +230,6 @@ private void classifyPoint(float[] xarr, float[] yarr, float[] zarr, float[] xar
     }
 
     private void addpoint(float[] xarr, float[] yarr, float[] zarr, float[] xarrfft, float[] yarrfft, float[] zarrfft) {
-        if (System.currentTimeMillis() - lastplayed < threshdelay) {
-            return;
-        }
-        lastplayed = System.currentTimeMillis();
         float[] datapoint = new float[fftsize * 9];
         float abssum = 0;
         for (int i = 0; i < fftsize * 2; i++) {

diff --git a/app/src/main/java/rasdasd/com/handstodrums/ML1_Holder.java b/app/src/main/java/rasdasd/com/handstodrums/ML1_Holder.java
@@ -11,7 +11,7 @@ public class ML1_Holder implements Holder {
     public int classes = 0;
     MLP mlp;
     int outputsize;
-    int iterations = 10000;
+    int iterations = 100;
     public ML1_Holder(int classes, int inputsize)
     {
         outputsize = Integer.SIZE-Integer.numberOfLeadingZeros(classes-1);

diff --git a/app/src/main/java/rasdasd/com/handstodrums/ML2_Holder.java b/app/src/main/java/rasdasd/com/handstodrums/ML2_Holder.java
@@ -11,7 +11,7 @@ public class ML2_Holder implements Holder{
     public int classes = 0;
     MLP mlp;
     int outputsize;
-    int iterations = 10000;
+    int iterations = 100;
     public ML2_Holder(int classes, int inputsize)
     {
         outputsize = Integer.SIZE-Integer.numberOfLeadingZeros(classes-1);

diff --git a/app/src/main/java/rasdasd/com/handstodrums/ML3_Holder.java b/app/src/main/java/rasdasd/com/handstodrums/ML3_Holder.java
@@ -11,7 +11,7 @@ public class ML3_Holder implements Holder{
     public int classes = 0;
     MLP mlp;
     int outputsize;
-    int iterations = 10000;
+    int iterations = 100;
     public ML3_Holder(int classes, int inputsize)
     {
         outputsize = Integer.SIZE-Integer.numberOfLeadingZeros(classes-1);

diff --git a/app/src/main/java/rasdasd/com/handstodrums/ML4_Holder.java b/app/src/main/java/rasdasd/com/handstodrums/ML4_Holder.java
@@ -11,7 +11,7 @@ public class ML4_Holder implements Holder{
     public int classes = 0;
     MLP mlp;
     int outputsize;
-    int iterations = 10000;
+    int iterations = 100;
     public ML4_Holder(int classes, int inputsize)
     {
         outputsize = Integer.SIZE-Integer.numberOfLeadingZeros(classes-1);

diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -104,13 +104,13 @@
         android:id="@+id/mntCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Floor: "
+        android:text="Mount: "
         />
     <TextView
         android:id="@+id/flrCount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Mount: "
+        android:text="Floor: "
         />
     <TextView
         android:id="@+id/snareCount"