ref #9 - verbindung zwischen watch und app geht
- watch startet automatisch auch app - bpm kommen in hoher geschwindigkeit an ref #19 - rückweisunsklasse etwas verbessert - fehlnde files hochgeladen für die bpm estimation
This commit is contained in:
toni
1
android/ConductorsPhone/app/.gitignore
vendored
Normal file
1
android/ConductorsPhone/app/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
35
android/ConductorsPhone/app/build.gradle
Normal file
35
android/ConductorsPhone/app/build.gradle
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion 26
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "de.tonifetzer.conductorswatch"
|
||||||
|
minSdkVersion 23
|
||||||
|
targetSdkVersion 26
|
||||||
|
versionCode 1
|
||||||
|
versionName "1.0"
|
||||||
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
|
}
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||||
|
testImplementation 'junit:junit:4.12'
|
||||||
|
androidTestImplementation 'com.android.support.test:runner:1.0.1'
|
||||||
|
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
|
||||||
|
implementation 'com.google.android.support:wearable:2.1.0'
|
||||||
|
implementation 'com.google.android.gms:play-services-wearable:11.8.0'
|
||||||
|
implementation 'com.android.support:percent:26.1.0'
|
||||||
|
implementation 'com.android.support:animated-vector-drawable:26.1.0'
|
||||||
|
implementation 'com.android.support:appcompat-v7:26.1.0'
|
||||||
|
implementation 'com.android.support:support-v4:26.1.0'
|
||||||
|
implementation 'com.android.support:recyclerview-v7:26.1.0'
|
||||||
|
compileOnly 'com.google.android.wearable:wearable:2.1.0'
|
||||||
|
}
|
||||||
21
android/ConductorsPhone/app/proguard-rules.pro
vendored
Normal file
21
android/ConductorsPhone/app/proguard-rules.pro
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package de.tonifetzer.conductorswatch;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.support.test.InstrumentationRegistry;
|
||||||
|
import android.support.test.runner.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() throws Exception {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getTargetContext();
|
||||||
|
|
||||||
|
assertEquals("de.tonifetzer.conductorsphone", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
34
android/ConductorsPhone/app/src/main/AndroidManifest.xml
Normal file
34
android/ConductorsPhone/app/src/main/AndroidManifest.xml
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="de.tonifetzer.conductorswatch">
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme">
|
||||||
|
|
||||||
|
<meta-data android:name="com.google.android.gms.version"
|
||||||
|
android:value="@integer/google_play_services_version" />
|
||||||
|
|
||||||
|
<service android:name=".DataLayerListenerService">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
|
||||||
|
<data android:scheme="wear" android:host="*" android:pathPrefix="/start-activity"/>
|
||||||
|
</intent-filter>
|
||||||
|
</service>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".MainActivity"
|
||||||
|
android:label="@string/app_name">
|
||||||
|
>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package de.tonifetzer.conductorswatch;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.util.Log;
|
||||||
|
import com.google.android.gms.common.api.GoogleApiClient;
|
||||||
|
import com.google.android.gms.wearable.MessageEvent;
|
||||||
|
import com.google.android.gms.wearable.Wearable;
|
||||||
|
import com.google.android.gms.wearable.WearableListenerService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Listens to DataItems and Messages from the local node.
|
||||||
|
*/
|
||||||
|
public class DataLayerListenerService extends WearableListenerService {
|
||||||
|
|
||||||
|
private static final String TAG = "DataLayerService";
|
||||||
|
private static final String START_ACTIVITY_PATH = "/start-activity";
|
||||||
|
|
||||||
|
GoogleApiClient mGoogleApiClient;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate() {
|
||||||
|
super.onCreate();
|
||||||
|
mGoogleApiClient = new GoogleApiClient.Builder(this)
|
||||||
|
.addApi(Wearable.API)
|
||||||
|
.build();
|
||||||
|
mGoogleApiClient.connect();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMessageReceived(MessageEvent messageEvent) {
|
||||||
|
LOGD(TAG, "onMessageReceived: " + messageEvent);
|
||||||
|
|
||||||
|
// Check to see if the message is to start an activity
|
||||||
|
if (messageEvent.getPath().equals(START_ACTIVITY_PATH)) {
|
||||||
|
Intent startIntent = new Intent(this, MainActivity.class);
|
||||||
|
startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
startActivity(startIntent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void LOGD(final String tag, String message) {
|
||||||
|
if (Log.isLoggable(tag, Log.DEBUG)) {
|
||||||
|
Log.d(tag, message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package de.tonifetzer.conductorswatch;
|
||||||
|
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.google.android.gms.tasks.Task;
|
||||||
|
import com.google.android.gms.wearable.MessageEvent;
|
||||||
|
import com.google.android.gms.wearable.MessageClient;
|
||||||
|
import com.google.android.gms.wearable.Wearable;
|
||||||
|
|
||||||
|
public class MainActivity extends AppCompatActivity implements MessageClient.OnMessageReceivedListener{
|
||||||
|
|
||||||
|
private TextView mTextView;
|
||||||
|
private String mCurBPM;
|
||||||
|
|
||||||
|
private static final String TAG = "DataLayerService";
|
||||||
|
private static final String START_ACTIVITY_PATH = "/start-activity";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
|
mTextView = (TextView) findViewById(R.id.bpmText);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
Wearable.getMessageClient(this).addListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
Wearable.getMessageClient(this).removeListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMessageReceived(MessageEvent messageEvent) {
|
||||||
|
// Check to see if the message is to start an activity
|
||||||
|
if (messageEvent.getPath().equals(START_ACTIVITY_PATH)) {
|
||||||
|
Log.d(TAG, "onStartReceived: " + messageEvent);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
//update bpm
|
||||||
|
Log.d(TAG, "onBPMReceived: " + messageEvent);
|
||||||
|
//mTextView.setText(messageEvent.getPath());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:aapt="http://schemas.android.com/aapt"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportHeight="108"
|
||||||
|
android:viewportWidth="108">
|
||||||
|
<path
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:strokeWidth="1">
|
||||||
|
<aapt:attr name="android:fillColor">
|
||||||
|
<gradient
|
||||||
|
android:endX="78.5885"
|
||||||
|
android:endY="90.9159"
|
||||||
|
android:startX="48.7653"
|
||||||
|
android:startY="61.0927"
|
||||||
|
android:type="linear">
|
||||||
|
<item
|
||||||
|
android:color="#44000000"
|
||||||
|
android:offset="0.0" />
|
||||||
|
<item
|
||||||
|
android:color="#00000000"
|
||||||
|
android:offset="1.0" />
|
||||||
|
</gradient>
|
||||||
|
</aapt:attr>
|
||||||
|
</path>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFF"
|
||||||
|
android:fillType="nonZero"
|
||||||
|
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:strokeWidth="1" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportHeight="108"
|
||||||
|
android:viewportWidth="108">
|
||||||
|
<path
|
||||||
|
android:fillColor="#26A69A"
|
||||||
|
android:pathData="M0,0h108v108h-108z" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M9,0L9,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,0L19,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M29,0L29,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M39,0L39,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M49,0L49,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M59,0L59,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M69,0L69,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M79,0L79,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M89,0L89,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M99,0L99,108"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,9L108,9"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,19L108,19"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,29L108,29"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,39L108,39"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,49L108,49"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,59L108,59"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,69L108,69"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,79L108,79"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,89L108,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,99L108,99"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,29L89,29"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,39L89,39"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,49L89,49"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,59L89,59"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,69L89,69"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,79L89,79"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M29,19L29,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M39,19L39,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M49,19L49,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M59,19L59,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M69,19L69,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M79,19L79,89"
|
||||||
|
android:strokeColor="#33FFFFFF"
|
||||||
|
android:strokeWidth="0.8" />
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context="de.tonifetzer.conductorswatch.MainActivity">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/bpmText"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
android:text="240"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="#158b69"
|
||||||
|
android:textSize="100sp"/>
|
||||||
|
|
||||||
|
</android.support.constraint.ConstraintLayout>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@drawable/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@drawable/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
</adaptive-icon>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#3F51B5</color>
|
||||||
|
<color name="colorPrimaryDark">#303F9F</color>
|
||||||
|
<color name="colorAccent">#FF4081</color>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">Conductor\'s Phone</string>
|
||||||
|
</resources>
|
||||||
11
android/ConductorsPhone/app/src/main/res/values/styles.xml
Normal file
11
android/ConductorsPhone/app/src/main/res/values/styles.xml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<resources>
|
||||||
|
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package de.tonifetzer.conductorswatch;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() throws Exception {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
27
android/ConductorsPhone/build.gradle
Normal file
27
android/ConductorsPhone/build.gradle
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||||
|
|
||||||
|
|
||||||
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
// in the individual module build.gradle files
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task clean(type: Delete) {
|
||||||
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
17
android/ConductorsPhone/gradle.properties
Normal file
17
android/ConductorsPhone/gradle.properties
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
# Project-wide Gradle settings.
|
||||||
|
|
||||||
|
# IDE (e.g. Android Studio) users:
|
||||||
|
# Gradle settings configured through the IDE *will override*
|
||||||
|
# any settings specified in this file.
|
||||||
|
|
||||||
|
# For more details on how to configure your build environment visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
|
|
||||||
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
|
org.gradle.jvmargs=-Xmx1536m
|
||||||
|
|
||||||
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
# org.gradle.parallel=true
|
||||||
BIN
android/ConductorsPhone/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
android/ConductorsPhone/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
android/ConductorsPhone/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
android/ConductorsPhone/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
#Tue Dec 19 11:59:51 CET 2017
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||||
160
android/ConductorsPhone/gradlew
vendored
Executable file
160
android/ConductorsPhone/gradlew
vendored
Executable file
@@ -0,0 +1,160 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS=""
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn ( ) {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die ( ) {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||||
|
function splitJvmOpts() {
|
||||||
|
JVM_OPTS=("$@")
|
||||||
|
}
|
||||||
|
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||||
|
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||||
|
|
||||||
|
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||||
90
android/ConductorsPhone/gradlew.bat
vendored
Normal file
90
android/ConductorsPhone/gradlew.bat
vendored
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS=
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windowz variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
goto execute
|
||||||
|
|
||||||
|
:4NT_args
|
||||||
|
@rem Get arguments from the 4NT Shell from JP Software
|
||||||
|
set CMD_LINE_ARGS=%$
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
1
android/ConductorsPhone/settings.gradle
Normal file
1
android/ConductorsPhone/settings.gradle
Normal file
@@ -0,0 +1 @@
|
|||||||
|
include ':app'
|
||||||
9
android/ConductorsWatch/.gitignore
vendored
Normal file
9
android/ConductorsWatch/.gitignore
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
*.iml
|
||||||
|
.gradle
|
||||||
|
/local.properties
|
||||||
|
/.idea/workspace.xml
|
||||||
|
/.idea/libraries
|
||||||
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
|
.externalNativeBuild
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.bpmEstimation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 15/12/17.
|
||||||
|
*/
|
||||||
|
public class AccelerometerData {
|
||||||
|
|
||||||
|
public double x,y,z;
|
||||||
|
public long ts;
|
||||||
|
|
||||||
|
public AccelerometerData(long ts, double x, double y, double z){
|
||||||
|
this.ts = ts;
|
||||||
|
this.x = x;
|
||||||
|
this.y = y;
|
||||||
|
this.z = z;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object other){
|
||||||
|
|
||||||
|
if (this == other)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (!(other instanceof AccelerometerData)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
AccelerometerData ad = (AccelerometerData) other;
|
||||||
|
return ts == ad.ts;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.bpmEstimation;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 16/12/17.
|
||||||
|
*/
|
||||||
|
public class AccelerometerInterpolator {
|
||||||
|
|
||||||
|
private double[] mX;
|
||||||
|
private double[] mY;
|
||||||
|
private double[] mZ;
|
||||||
|
private long[] mTsInterp;
|
||||||
|
|
||||||
|
public AccelerometerInterpolator(AccelerometerWindowBuffer ab, double sampleRate_ms){
|
||||||
|
|
||||||
|
long size = (ab.getYongest().ts - (ab.getOldest().ts - (long) sampleRate_ms)) / (long) sampleRate_ms;
|
||||||
|
mTsInterp = new long[(int)size];
|
||||||
|
int j = 0;
|
||||||
|
for(long i = ab.getOldest().ts; i <= ab.getYongest().ts; i += sampleRate_ms){
|
||||||
|
mTsInterp[j++] = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
mX = interpLinear(ab.getTs(), ab.getX(), mTsInterp);
|
||||||
|
mY = interpLinear(ab.getTs(), ab.getY(), mTsInterp);
|
||||||
|
mZ = interpLinear(ab.getTs(), ab.getZ(), mTsInterp);
|
||||||
|
}
|
||||||
|
|
||||||
|
public long[] getTs(){
|
||||||
|
return mTsInterp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getX(){
|
||||||
|
return mX;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getY(){
|
||||||
|
return mY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getZ(){
|
||||||
|
return mZ;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double[] interpLinear(double[] x, double[] y, double[] xi) throws IllegalArgumentException {
|
||||||
|
if (x.length != y.length) {
|
||||||
|
throw new IllegalArgumentException("X and Y must be the same length");
|
||||||
|
}
|
||||||
|
if (x.length == 1) {
|
||||||
|
throw new IllegalArgumentException("X must contain more than one value");
|
||||||
|
}
|
||||||
|
double[] dx = new double[x.length - 1];
|
||||||
|
double[] dy = new double[x.length - 1];
|
||||||
|
double[] slope = new double[x.length - 1];
|
||||||
|
double[] intercept = new double[x.length - 1];
|
||||||
|
|
||||||
|
// Calculate the line equation (i.e. slope and intercept) between each point
|
||||||
|
for (int i = 0; i < x.length - 1; i++) {
|
||||||
|
dx[i] = x[i + 1] - x[i];
|
||||||
|
if (dx[i] == 0) {
|
||||||
|
throw new IllegalArgumentException("X must be montotonic. A duplicate " + "x-value was found");
|
||||||
|
}
|
||||||
|
if (dx[i] < 0) {
|
||||||
|
throw new IllegalArgumentException("X must be sorted");
|
||||||
|
}
|
||||||
|
dy[i] = y[i + 1] - y[i];
|
||||||
|
slope[i] = dy[i] / dx[i];
|
||||||
|
intercept[i] = y[i] - x[i] * slope[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Perform the interpolation here
|
||||||
|
double[] yi = new double[xi.length];
|
||||||
|
for (int i = 0; i < xi.length; i++) {
|
||||||
|
if ((xi[i] > x[x.length - 1]) || (xi[i] < x[0])) {
|
||||||
|
yi[i] = Double.NaN;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
int loc = Arrays.binarySearch(x, xi[i]);
|
||||||
|
if (loc < -1) {
|
||||||
|
loc = -loc - 2;
|
||||||
|
yi[i] = slope[loc] * xi[i] + intercept[loc];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
yi[i] = y[loc];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return yi;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double[] interpLinear(long[] x, double[] y, long[] xi) throws IllegalArgumentException {
|
||||||
|
|
||||||
|
double[] xd = new double[x.length];
|
||||||
|
for (int i = 0; i < x.length; i++) {
|
||||||
|
xd[i] = x[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
double[] xid = new double[xi.length];
|
||||||
|
for (int i = 0; i < xi.length; i++) {
|
||||||
|
xid[i] = xi[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
return interpLinear(xd, y, xid);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.bpmEstimation;
|
||||||
|
|
||||||
|
import de.tonifetzer.conductorswatch.utilities.Utils;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 15/12/17.
|
||||||
|
*/
|
||||||
|
public class AccelerometerWindowBuffer extends ArrayList<AccelerometerData> {
|
||||||
|
|
||||||
|
private int mWindowSize;
|
||||||
|
private int mOverlapSize;
|
||||||
|
private int mOverlapCounter;
|
||||||
|
|
||||||
|
public AccelerometerWindowBuffer(int windowSize, int overlap){
|
||||||
|
mWindowSize = windowSize;
|
||||||
|
mOverlapSize = overlap;
|
||||||
|
mOverlapCounter = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: add exception handling. falseArgument if ad has no numeric x,y,z
|
||||||
|
public boolean add(AccelerometerData ad){
|
||||||
|
|
||||||
|
//do not add duplicates!
|
||||||
|
if(!isEmpty() && getYongest().equals(ad)){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean r = super.add(ad);
|
||||||
|
if (size() > mWindowSize){
|
||||||
|
removeRange(0, size() - mWindowSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
++mOverlapCounter;
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isNextWindowReady(){
|
||||||
|
if((size() > mWindowSize / 2) && mOverlapCounter > mOverlapSize){
|
||||||
|
mOverlapCounter = 1;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public AccelerometerData getYongest() {
|
||||||
|
return get(size() - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public AccelerometerData getOldest() {
|
||||||
|
return get(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getX(){
|
||||||
|
return this.stream().mapToDouble(d -> d.x).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getY(){
|
||||||
|
return this.stream().mapToDouble(d -> d.y).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getZ(){
|
||||||
|
return this.stream().mapToDouble(d -> d.z).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public long[] getTs(){
|
||||||
|
return this.stream().mapToLong(d -> d.ts).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getOverlapSize(){
|
||||||
|
return mOverlapSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.bpmEstimation;
|
||||||
|
|
||||||
|
import org.jtransforms.fft.DoubleFFT_1D;
|
||||||
|
import de.tonifetzer.conductorswatch.utilities.Utils;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 15/12/17.
|
||||||
|
*/
|
||||||
|
public class AutoCorrelation {
|
||||||
|
|
||||||
|
private int mMaxLag;
|
||||||
|
private double[] mCorr;
|
||||||
|
|
||||||
|
public AutoCorrelation(double[] data, int maxLag){
|
||||||
|
|
||||||
|
mMaxLag = maxLag;
|
||||||
|
mCorr = fft(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getCorr(){
|
||||||
|
return mCorr;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double[] fft(double[] data) {
|
||||||
|
|
||||||
|
if(mMaxLag < 1){
|
||||||
|
throw new RuntimeException("maxlag has to be greater 1");
|
||||||
|
}
|
||||||
|
|
||||||
|
int n = data.length;
|
||||||
|
double[] x = Arrays.copyOf(data, n);
|
||||||
|
int mxl = Math.min(mMaxLag, n - 1);
|
||||||
|
int ceilLog2 = Utils.nextPow2(2*n -1);
|
||||||
|
int n2 = (int) Math.pow(2,ceilLog2);
|
||||||
|
|
||||||
|
// x - mean(x) (pointwise)
|
||||||
|
double x_mean = Utils.mean(x);
|
||||||
|
for(int i = 0; i < x.length; ++i){
|
||||||
|
x[i] -= x_mean;
|
||||||
|
}
|
||||||
|
|
||||||
|
// double the size of x and fill up with zeros. if x is not even, add additional 0
|
||||||
|
double[] x2 = new double[n2 * 2]; //need double the size for fft.realForwardFull (look into method description)
|
||||||
|
Arrays.fill(x2, 0);
|
||||||
|
System.arraycopy(x,0, x2, 0, x.length);
|
||||||
|
|
||||||
|
// x_fft calculate fft 1D
|
||||||
|
DoubleFFT_1D fft = new DoubleFFT_1D(n2);
|
||||||
|
fft.realForwardFull(x2);
|
||||||
|
|
||||||
|
// Cr = abs(x_fft).^2 (absolute with complex numbers is (r^2) + (i^2)
|
||||||
|
double[] Cr = new double[n2 * 2];
|
||||||
|
int j = 0;
|
||||||
|
for(int i = 0; i < x2.length; ++i){
|
||||||
|
Cr[j++] = Utils.sqr(x2[i]) + Utils.sqr(x2[i+1]);
|
||||||
|
++i; //skip the complex part
|
||||||
|
}
|
||||||
|
|
||||||
|
// ifft(Cr,[],1)
|
||||||
|
DoubleFFT_1D ifft = new DoubleFFT_1D(n2);
|
||||||
|
ifft.realInverseFull(Cr, true);
|
||||||
|
|
||||||
|
// remove complex part and scale/normalize
|
||||||
|
double[] c1 = new double[n2];
|
||||||
|
j = 0;
|
||||||
|
for(int i = 0; i < Cr.length; ++i){
|
||||||
|
c1[j++] = Cr[i] / Cr[0];
|
||||||
|
++i; //skip the complex part
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keep only the lags we want and move negative lags before positive lags.
|
||||||
|
double[] c = new double[(mxl * 2) + 1];
|
||||||
|
System.arraycopy(c1, 0, c, mxl, mxl + 1); // +1 to place the 1.0 in the middle of correlation
|
||||||
|
System.arraycopy(c1, n2 - mxl, c, 0, mxl);
|
||||||
|
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,199 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.bpmEstimation;
|
||||||
|
|
||||||
|
import de.tonifetzer.conductorswatch.utilities.MovingFilter;
|
||||||
|
import de.tonifetzer.conductorswatch.utilities.SimpleKalman;
|
||||||
|
import de.tonifetzer.conductorswatch.utilities.Utils;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 17/12/17.
|
||||||
|
*/
|
||||||
|
public class BpmEstimator {
|
||||||
|
|
||||||
|
private AccelerometerWindowBuffer mBuffer;
|
||||||
|
private double mSampleRate_ms;
|
||||||
|
|
||||||
|
private LinkedList<Double> mBpmHistory_X;
|
||||||
|
private LinkedList<Double> mBpmHistory_Y;
|
||||||
|
private LinkedList<Double> mBpmHistory_Z;
|
||||||
|
|
||||||
|
private LinkedList<Double> mBpmHistory;
|
||||||
|
private int mResetCounter;
|
||||||
|
private int mResetLimit_ms;
|
||||||
|
|
||||||
|
private MovingFilter mMvg;
|
||||||
|
//private SimpleKalman mKalman;
|
||||||
|
|
||||||
|
|
||||||
|
public BpmEstimator(AccelerometerWindowBuffer windowBuffer, double sampleRate_ms, int resetAfter_ms){
|
||||||
|
mBuffer = windowBuffer;
|
||||||
|
mSampleRate_ms = sampleRate_ms;
|
||||||
|
|
||||||
|
mBpmHistory_X = new LinkedList<>();
|
||||||
|
mBpmHistory_Y = new LinkedList<>();
|
||||||
|
mBpmHistory_Z = new LinkedList<>();
|
||||||
|
|
||||||
|
mBpmHistory = new LinkedList<>();
|
||||||
|
mResetCounter = 0;
|
||||||
|
mResetLimit_ms = resetAfter_ms;
|
||||||
|
|
||||||
|
mMvg = new MovingFilter(2);
|
||||||
|
//mKalman = new SimpleKalman();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double estimate(){
|
||||||
|
|
||||||
|
double sampleRate = mSampleRate_ms;
|
||||||
|
if(sampleRate <= 0){
|
||||||
|
sampleRate = Math.round(Utils.mean(Utils.diff(mBuffer.getTs())));
|
||||||
|
}
|
||||||
|
|
||||||
|
AccelerometerInterpolator interp = new AccelerometerInterpolator(mBuffer, sampleRate);
|
||||||
|
|
||||||
|
//are we conducting?
|
||||||
|
//just look at the newest 512 samples
|
||||||
|
//List<AccelerometerData> subBuffer = mBuffer.subList(mBuffer.size() - 512, mBuffer.size());
|
||||||
|
|
||||||
|
double[] xAutoCorr = new AutoCorrelation(interp.getX(), 512).getCorr();
|
||||||
|
double[] yAutoCorr = new AutoCorrelation(interp.getY(), 512).getCorr();
|
||||||
|
double[] zAutoCorr = new AutoCorrelation(interp.getZ(), 512).getCorr();
|
||||||
|
|
||||||
|
Peaks pX = new Peaks(xAutoCorr, 50, 0.1f, 0, false);
|
||||||
|
Peaks pY = new Peaks(yAutoCorr, 50, 0.1f, 0, false);
|
||||||
|
Peaks pZ = new Peaks(zAutoCorr, 50, 0.1f, 0, false);
|
||||||
|
|
||||||
|
mBpmHistory_X.add(pX.getBPM(sampleRate));
|
||||||
|
mBpmHistory_Y.add(pY.getBPM(sampleRate));
|
||||||
|
mBpmHistory_Z.add(pZ.getBPM(sampleRate));
|
||||||
|
|
||||||
|
double estimatedBPM = getBestBpmEstimation(pX, pY, pZ);
|
||||||
|
if(estimatedBPM != -1){
|
||||||
|
|
||||||
|
//moving avg (lohnt dann, wenn wir viele daten haben)
|
||||||
|
mMvg.add(estimatedBPM);
|
||||||
|
mBpmHistory.add(mMvg.getAverage());
|
||||||
|
|
||||||
|
//moving median (lohnt nur bei konstantem tempo, da wir nur ein tempo damit gut halten können.)
|
||||||
|
//mMvg.add(estimatedBPM);
|
||||||
|
//mBpmHistory.add(mMvg.getMedian());
|
||||||
|
|
||||||
|
//kalman filter (lohnt dann, wenn wir konstantes tempo haben, mit startangabe!)
|
||||||
|
|
||||||
|
//standard last element
|
||||||
|
//mBpmHistory.add(estimatedBPM);
|
||||||
|
//mResetCounter = 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
int resetAfter = (int) Math.round(mResetLimit_ms / (mBuffer.getOverlapSize() * sampleRate));
|
||||||
|
if(++mResetCounter > resetAfter){
|
||||||
|
mBpmHistory.clear();
|
||||||
|
mBuffer.clear();
|
||||||
|
mMvg.clear();
|
||||||
|
mResetCounter = 0;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
//last element
|
||||||
|
return mBpmHistory.getLast();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getMeanBpm(){
|
||||||
|
return Utils.mean(mBpmHistory);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getMedianBPM(){
|
||||||
|
return Utils.median(mBpmHistory);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double getBestBpmEstimation(Peaks peaksX, Peaks peaksY, Peaks peaksZ) throws IllegalArgumentException {
|
||||||
|
|
||||||
|
int cntNumAxis = 0;
|
||||||
|
double sumCorr = 0; //to prevent division by zero
|
||||||
|
double sumRms = 0;
|
||||||
|
double sumNumInter = 0;
|
||||||
|
|
||||||
|
double corrMeanX = 0, corrRmsX = 0;
|
||||||
|
int corrNumInterX = 0;
|
||||||
|
if(peaksX.hasPeaks()){
|
||||||
|
corrMeanX = Utils.geometricMean(peaksX.getPeaksValueWithoutZeroIdxAndNegativeValues());
|
||||||
|
corrRmsX = Utils.rms(peaksX.getPeaksValueWithoutZeroIdx());
|
||||||
|
corrNumInterX = Utils.intersectionNumber(peaksX.getData(), 0.2f);
|
||||||
|
|
||||||
|
++cntNumAxis;
|
||||||
|
sumCorr += corrMeanX;
|
||||||
|
sumRms += corrRmsX;
|
||||||
|
sumNumInter += corrNumInterX;
|
||||||
|
}
|
||||||
|
|
||||||
|
double corrMeanY = 0, corrRmsY = 0;
|
||||||
|
int corrNumInterY = 0;
|
||||||
|
if(peaksY.hasPeaks()){
|
||||||
|
corrMeanY = Utils.geometricMean(peaksY.getPeaksValueWithoutZeroIdxAndNegativeValues());
|
||||||
|
corrRmsY = Utils.rms(peaksY.getPeaksValueWithoutZeroIdx());
|
||||||
|
corrNumInterY = Utils.intersectionNumber(peaksY.getData(), 0.2f);
|
||||||
|
|
||||||
|
++cntNumAxis;
|
||||||
|
sumCorr += corrMeanY;
|
||||||
|
sumRms += corrRmsY;
|
||||||
|
sumNumInter += corrNumInterY;
|
||||||
|
}
|
||||||
|
|
||||||
|
double corrMeanZ = 0, corrRmsZ = 0;
|
||||||
|
int corrNumInterZ = 0;
|
||||||
|
if(peaksZ.hasPeaks()){
|
||||||
|
corrMeanZ = Utils.geometricMean(peaksZ.getPeaksValueWithoutZeroIdxAndNegativeValues());
|
||||||
|
corrRmsZ = Utils.rms(peaksZ.getPeaksValueWithoutZeroIdx());
|
||||||
|
corrNumInterZ = Utils.intersectionNumber(peaksZ.getData(), 0.2f);
|
||||||
|
|
||||||
|
++cntNumAxis;
|
||||||
|
sumCorr += corrMeanZ;
|
||||||
|
sumRms += corrRmsZ;
|
||||||
|
sumNumInter += corrNumInterZ;
|
||||||
|
}
|
||||||
|
|
||||||
|
//no peaks, reject
|
||||||
|
if(cntNumAxis == 0){
|
||||||
|
//throw new IllegalArgumentException("All Peaks are empty! -> Reject Estimation");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
System.out.println("RMS-X: " + corrRmsX);
|
||||||
|
System.out.println("GEO-X: " + corrMeanX);
|
||||||
|
System.out.println("INTER-X: " + corrNumInterX);
|
||||||
|
|
||||||
|
System.out.println("RMS-Y: " + corrRmsY);
|
||||||
|
System.out.println("GEO-Y: " + corrMeanY);
|
||||||
|
System.out.println("INTER-Y: " + corrNumInterY);
|
||||||
|
|
||||||
|
System.out.println("RMS-Z: " + corrRmsZ);
|
||||||
|
System.out.println("GEO-Z: " + corrMeanZ);
|
||||||
|
System.out.println("INTER-Z: " + corrNumInterZ);
|
||||||
|
*/
|
||||||
|
|
||||||
|
//values to low, reject
|
||||||
|
//TODO: this is a pretty simple assumption. first shot!
|
||||||
|
if(corrRmsX < 0.25 && corrRmsY < 0.25 && corrRmsZ < 0.25){
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
double quantityX = ((corrMeanX / sumCorr) + (corrRmsX / sumRms) + (corrNumInterX / sumNumInter)) / cntNumAxis;
|
||||||
|
double quantityY = ((corrMeanY / sumCorr) + (corrRmsY / sumRms) + (corrNumInterY / sumNumInter)) / cntNumAxis;
|
||||||
|
double quantityZ = ((corrMeanZ / sumCorr) + (corrRmsZ / sumRms) + (corrNumInterZ / sumNumInter)) / cntNumAxis;
|
||||||
|
|
||||||
|
//get best axis by quantity and estimate bpm
|
||||||
|
if(quantityX > quantityY && quantityX > quantityZ){
|
||||||
|
return mBpmHistory_X.getLast();
|
||||||
|
}
|
||||||
|
else if(quantityY > quantityZ){
|
||||||
|
return mBpmHistory_Y.getLast();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return mBpmHistory_Z.getLast();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,206 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.bpmEstimation;
|
||||||
|
|
||||||
|
import de.tonifetzer.conductorswatch.utilities.Utils;
|
||||||
|
|
||||||
|
import java.util.LinkedList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 15/12/17.
|
||||||
|
*/
|
||||||
|
public class Peaks {
|
||||||
|
|
||||||
|
private LinkedList<Integer> mPeaksIdx; //provide the idx within the given data array
|
||||||
|
private LinkedList<Integer> mPeaksPos; //the real position within the data-rang e.g. lag -1024 to 1024
|
||||||
|
private LinkedList<Double> mPeaksValue; //the value at mPeaksPos
|
||||||
|
|
||||||
|
private double[] mData;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Simple method for finding local maxima in an array
|
||||||
|
* @param data input
|
||||||
|
* @param width minimum distance between peaks
|
||||||
|
* @param threshold minimum value of peaks
|
||||||
|
* @param decayRate how quickly previous peaks are forgotten
|
||||||
|
* @param isRelative minimum value of peaks is relative to local average
|
||||||
|
* @return array of peaks
|
||||||
|
*/
|
||||||
|
public Peaks(double[] data, int width, double threshold, double decayRate, boolean isRelative){
|
||||||
|
|
||||||
|
this.mData = data;
|
||||||
|
this.mPeaksIdx = new LinkedList<>();
|
||||||
|
this.mPeaksPos = new LinkedList<>();
|
||||||
|
this.mPeaksValue = new LinkedList<>();
|
||||||
|
|
||||||
|
//create the peaks
|
||||||
|
simplePeakFinder(data, width, threshold, decayRate, isRelative);
|
||||||
|
|
||||||
|
updateLists();
|
||||||
|
}
|
||||||
|
|
||||||
|
public LinkedList<Integer> getPeaksIdx() {
|
||||||
|
return mPeaksIdx;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int[] getPeaksIdxAsArray() {
|
||||||
|
return mPeaksIdx.stream().mapToInt(i->i).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public LinkedList<Integer> getPeaksPos() {
|
||||||
|
return mPeaksPos;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getPeaksPosAsArray() {
|
||||||
|
return mPeaksPos.stream().mapToDouble(i -> i).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public LinkedList<Double> getPeaksValue() {
|
||||||
|
return mPeaksValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getPeaksValueAsArray() {
|
||||||
|
return mPeaksValue.stream().mapToDouble(i -> i).toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getData(){
|
||||||
|
return mData;
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: implement findFalseDetectedPeaks
|
||||||
|
public void improveResults(double[] data){
|
||||||
|
|
||||||
|
updateLists();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getPeaksValueWithoutZeroIdx() {
|
||||||
|
|
||||||
|
double[] values = new double[mPeaksIdx.size() - 1];
|
||||||
|
int mid = (mData.length / 2);
|
||||||
|
int j = 0;
|
||||||
|
for(int i = 0; i < mPeaksIdx.size(); ++i){
|
||||||
|
if(!(mPeaksIdx.get(i) == mid)){
|
||||||
|
values[j] = mPeaksValue.get(i);
|
||||||
|
++j;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getPeaksValueWithoutNegativeValues() {
|
||||||
|
|
||||||
|
double[] values = new double[mPeaksIdx.size() - 1];
|
||||||
|
int i = 0;
|
||||||
|
for(Integer idx : mPeaksIdx) {
|
||||||
|
double curVal = mPeaksValue.get(idx);
|
||||||
|
if(curVal > 0){
|
||||||
|
values[i] = curVal;
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double[] getPeaksValueWithoutZeroIdxAndNegativeValues(){
|
||||||
|
double[] values = new double[mPeaksIdx.size() - 1];
|
||||||
|
int mid = (mData.length / 2);
|
||||||
|
int j = 0;
|
||||||
|
for(int i = 0; i < mPeaksIdx.size(); ++i){
|
||||||
|
double curVal = mPeaksValue.get(i);
|
||||||
|
if(!(mPeaksIdx.get(i) == mid) && curVal > 0){
|
||||||
|
values[j] = curVal;
|
||||||
|
++j;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasPeaks() {
|
||||||
|
return mPeaksIdx.size() > 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides an estimation of beats per minute given a samplerate in milliseconds
|
||||||
|
* @param sampleRate_ms
|
||||||
|
* @return bpm if peaks found and conducting activity recognized, else -1
|
||||||
|
*/
|
||||||
|
public double getBPM(double sampleRate_ms){
|
||||||
|
|
||||||
|
//todo: rückweisungsklasse kann auch hier mit rein.
|
||||||
|
if(hasPeaks()){
|
||||||
|
|
||||||
|
//todo diff and mean method for linkedlists for speed
|
||||||
|
//return 60000 / Utils.mean(Utils.diff(mPeaksPos.stream().mapToDouble(i -> i * sampleRate_ms).toArray()));
|
||||||
|
return 60000 / (sampleRate_ms * Utils.mean(Utils.diff(mPeaksPos.stream().mapToDouble(i -> i).toArray())));
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* updates the position and values of the found peaks.
|
||||||
|
* call this if peaks are somewhat changed.
|
||||||
|
*/
|
||||||
|
private void updateLists(){
|
||||||
|
//fill the position and the value lists
|
||||||
|
for(Integer idx : mPeaksIdx){
|
||||||
|
int mid = (mData.length / 2);
|
||||||
|
mPeaksPos.add(idx - mid);
|
||||||
|
|
||||||
|
mPeaksValue.add(mData[idx]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: findPeaks method identical to Matlab... with PeakProminence
|
||||||
|
|
||||||
|
private void simplePeakFinder(double[] data, int width, double threshold, double decayRate, boolean isRelative) {
|
||||||
|
int maxp;
|
||||||
|
int mid = 0;
|
||||||
|
int end = data.length;
|
||||||
|
double av = data[0];
|
||||||
|
while (mid < end) {
|
||||||
|
av = decayRate * av + (1 - decayRate) * data[mid];
|
||||||
|
if (av < data[mid])
|
||||||
|
av = data[mid];
|
||||||
|
int i = mid - width;
|
||||||
|
if (i < 0)
|
||||||
|
i = 0;
|
||||||
|
int stop = mid + width + 1;
|
||||||
|
if (stop > data.length)
|
||||||
|
stop = data.length;
|
||||||
|
maxp = i;
|
||||||
|
for (i++; i < stop; i++)
|
||||||
|
if (data[i] > data[maxp])
|
||||||
|
maxp = i;
|
||||||
|
if (maxp == mid) {
|
||||||
|
if (overThreshold(data, maxp, width, threshold, isRelative, av)){
|
||||||
|
this.mPeaksIdx.add(new Integer(maxp));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mid++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean overThreshold(double[] data, int index, int width,
|
||||||
|
double threshold, boolean isRelative,
|
||||||
|
double av) {
|
||||||
|
int pre = 3;
|
||||||
|
int post = 1;
|
||||||
|
|
||||||
|
if (data[index] < av)
|
||||||
|
return false;
|
||||||
|
if (isRelative) {
|
||||||
|
int iStart = index - pre * width;
|
||||||
|
if (iStart < 0)
|
||||||
|
iStart = 0;
|
||||||
|
int iStop = index + post * width;
|
||||||
|
if (iStop > data.length)
|
||||||
|
iStop = data.length;
|
||||||
|
double sum = 0;
|
||||||
|
int count = iStop - iStart;
|
||||||
|
while (iStart < iStop)
|
||||||
|
sum += data[iStart++];
|
||||||
|
return (data[index] > sum / count + threshold);
|
||||||
|
} else
|
||||||
|
return (data[index] > threshold);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.utilities;
|
||||||
|
|
||||||
|
import java.util.LinkedList;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 18/12/17.
|
||||||
|
*/
|
||||||
|
public class MovingFilter {
|
||||||
|
|
||||||
|
private int mSize;
|
||||||
|
private double mTotal = 0d;
|
||||||
|
private LinkedList<Double> mSamples = new LinkedList<>();
|
||||||
|
|
||||||
|
public MovingFilter(int size) {
|
||||||
|
this.mSize = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void add(double x) {
|
||||||
|
mTotal += x;
|
||||||
|
mSamples.add(x);
|
||||||
|
if(mSamples.size() > mSize){
|
||||||
|
mTotal -= mSamples.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getAverage() {
|
||||||
|
return mTotal / mSamples.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getMedian() {
|
||||||
|
return Utils.median(mSamples);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clear(){
|
||||||
|
mSamples.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package de.tonifetzer.conductorswatch.utilities;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by toni on 18/12/17.
|
||||||
|
*/
|
||||||
|
public class SimpleKalman {
|
||||||
|
|
||||||
|
private double mSigmaUpdate;
|
||||||
|
private double mSigmaPrediction;
|
||||||
|
private double mMu;
|
||||||
|
private double mSigma;
|
||||||
|
|
||||||
|
SimpleKalman(double initialMu, double initialSigma, double sigmaUpdate, double sigmaPrediction){
|
||||||
|
mSigmaUpdate = sigmaUpdate;
|
||||||
|
mSigmaPrediction = sigmaPrediction;
|
||||||
|
mMu = initialMu;
|
||||||
|
mSigma = initialSigma;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double update(double data){
|
||||||
|
|
||||||
|
//prediction
|
||||||
|
mMu = mMu;
|
||||||
|
mSigma += mSigmaPrediction;
|
||||||
|
|
||||||
|
//update
|
||||||
|
double k = mSigma / (mSigma + mSigmaUpdate);
|
||||||
|
mMu = mMu + k * (data - mMu);
|
||||||
|
mSigma = (1 - k) * mSigma;
|
||||||
|
|
||||||
|
return mMu;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user