From ef907052dbbd0fabaaa23456b7d3347d161cecd4 Mon Sep 17 00:00:00 2001 From: bepo23 Date: Fri, 5 Jun 2009 08:13:58 +0000 Subject: [PATCH] Renamed package namespaces to assure a better usability with other libraries. git-svn-id: svn://svn.code.sf.net/p/wiigee/code/trunk@81 c7eff9ee-dd40-0410-8832-91a4d88773cf --- lib/nblibraries.properties | 10 ++ nbproject/project.properties | 145 +++++++++--------- .../wiigee}/control/AndroidWiigee.java | 10 +- .../control/WiimoteDeviceDiscovery.java | 6 +- .../wiigee}/control/WiimoteWiigee.java | 12 +- .../wiigee}/device/AndroidDevice.java | 19 ++- src/{ => org/wiigee}/device/Device.java | 10 +- src/{ => org/wiigee}/device/Wiimote.java | 6 +- .../wiigee}/device/WiimoteStreamer.java | 8 +- .../wiigee}/event/AccelerationEvent.java | 4 +- .../wiigee}/event/ActionStartEvent.java | 4 +- .../wiigee}/event/ActionStopEvent.java | 4 +- .../wiigee}/event/ButtonPressedEvent.java | 4 +- .../wiigee}/event/ButtonReleasedEvent.java | 4 +- .../wiigee}/event/DeviceListener.java | 2 +- src/{ => org/wiigee}/event/GestureEvent.java | 4 +- .../wiigee}/event/GestureListener.java | 2 +- src/{ => org/wiigee}/event/InfraredEvent.java | 4 +- .../wiigee}/event/MotionStartEvent.java | 4 +- .../wiigee}/event/MotionStopEvent.java | 4 +- src/{ => org/wiigee}/event/StateEvent.java | 4 +- .../filter/DirectionalEquivalenceFilter.java | 2 +- src/{ => org/wiigee}/filter/Filter.java | 2 +- .../wiigee}/filter/HighPassFilter.java | 2 +- .../wiigee}/filter/IdleStateFilter.java | 2 +- .../wiigee}/filter/LowPassFilter.java | 2 +- .../wiigee}/filter/MotionDetectFilter.java | 4 +- src/{ => org/wiigee}/logic/Classifier.java | 2 +- src/{ => org/wiigee}/logic/Gesture.java | 4 +- src/{ => org/wiigee}/logic/GestureModel.java | 6 +- src/{ => org/wiigee}/logic/HMM.java | 4 +- src/{ => org/wiigee}/logic/PreciseHMM.java | 50 +++++- .../wiigee}/logic/ProcessingUnit.java | 24 +-- src/{ => org/wiigee}/logic/Quantizer.java | 6 +- src/{ => org/wiigee}/logic/ScaledHMM.java | 2 +- .../logic/TriggeredProcessingUnit.java | 10 +- src/{ => org/wiigee}/util/FileIO.java | 8 +- src/{ => org/wiigee}/util/Log.java | 2 +- test/event/AccelerationEventTest.java | 97 ++++++++++++ 39 files changed, 330 insertions(+), 169 deletions(-) rename src/{ => org/wiigee}/control/AndroidWiigee.java (94%) rename src/{ => org/wiigee}/control/WiimoteDeviceDiscovery.java (96%) rename src/{ => org/wiigee}/control/WiimoteWiigee.java (96%) rename src/{ => org/wiigee}/device/AndroidDevice.java (80%) rename src/{ => org/wiigee}/device/Device.java (96%) rename src/{ => org/wiigee}/device/Wiimote.java (99%) rename src/{ => org/wiigee}/device/WiimoteStreamer.java (98%) rename src/{ => org/wiigee}/event/AccelerationEvent.java (97%) rename src/{ => org/wiigee}/event/ActionStartEvent.java (97%) rename src/{ => org/wiigee}/event/ActionStopEvent.java (95%) rename src/{ => org/wiigee}/event/ButtonPressedEvent.java (98%) rename src/{ => org/wiigee}/event/ButtonReleasedEvent.java (95%) rename src/{ => org/wiigee}/event/DeviceListener.java (99%) rename src/{ => org/wiigee}/event/GestureEvent.java (96%) rename src/{ => org/wiigee}/event/GestureListener.java (98%) rename src/{ => org/wiigee}/event/InfraredEvent.java (96%) rename src/{ => org/wiigee}/event/MotionStartEvent.java (96%) rename src/{ => org/wiigee}/event/MotionStopEvent.java (95%) rename src/{ => org/wiigee}/event/StateEvent.java (96%) rename src/{ => org/wiigee}/filter/DirectionalEquivalenceFilter.java (98%) rename src/{ => org/wiigee}/filter/Filter.java (98%) rename src/{ => org/wiigee}/filter/HighPassFilter.java (98%) rename src/{ => org/wiigee}/filter/IdleStateFilter.java (98%) rename src/{ => org/wiigee}/filter/LowPassFilter.java (98%) rename src/{ => org/wiigee}/filter/MotionDetectFilter.java (97%) rename src/{ => org/wiigee}/logic/Classifier.java (99%) rename src/{ => org/wiigee}/logic/Gesture.java (98%) rename src/{ => org/wiigee}/logic/GestureModel.java (98%) rename src/{ => org/wiigee}/logic/HMM.java (99%) rename src/{ => org/wiigee}/logic/PreciseHMM.java (91%) rename src/{ => org/wiigee}/logic/ProcessingUnit.java (79%) rename src/{ => org/wiigee}/logic/Quantizer.java (98%) rename src/{ => org/wiigee}/logic/ScaledHMM.java (99%) rename src/{ => org/wiigee}/logic/TriggeredProcessingUnit.java (96%) rename src/{ => org/wiigee}/util/FileIO.java (98%) rename src/{ => org/wiigee}/util/Log.java (97%) create mode 100644 test/event/AccelerationEventTest.java diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index e69de29..8c8ab62 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -0,0 +1,10 @@ +libs.junit_4.classpath=\ + ${base}/junit_4/junit-4.5.jar +libs.junit_4.javadoc=\ + ${base}/junit_4/junit-4.5-api.zip +libs.junit_4.src=\ + ${base}/junit_4/junit-4.5-src.jar +libs.junit.classpath=\ + ${base}/junit/junit-3.8.2.jar +libs.junit.javadoc=\ + ${base}/junit/junit-3.8.2-api.zip diff --git a/nbproject/project.properties b/nbproject/project.properties index 23d8e8d..80e6b09 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,72 +1,73 @@ -application.title=wiigee-lib -application.vendor=bepo -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/wiigee-lib.jar -dist.javadoc.dir=${dist.dir}/javadoc -excludes= -file.reference.android.jar=lib/android.jar -file.reference.bluecove-2.1.0.jar=lib/bluecove-2.1.0.jar -includes=** -jar.compress=false -javac.classpath=\ - ${file.reference.bluecove-2.1.0.jar}:\ - ${file.reference.android.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jnlp.codebase.type=local -jnlp.codebase.url=file:/Users/bepo/develop/java/waste/wiigee-lib/dist -jnlp.descriptor=application -jnlp.enabled=false -jnlp.offline-allowed=false -jnlp.signed=false -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test +application.title=wiigee-lib +application.vendor=bepo +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/wiigee-lib.jar +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +file.reference.android.jar=lib/android.jar +file.reference.bluecove-2.1.0.jar=lib/bluecove-2.1.0.jar +includes=** +jar.compress=false +javac.classpath=\ + ${file.reference.bluecove-2.1.0.jar}:\ + ${file.reference.android.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +jnlp.codebase.type=local +jnlp.codebase.url=file:/Users/bepo/develop/java/wiigee/trunk/wiigee-lib/dist +jnlp.descriptor=application +jnlp.enabled=false +jnlp.offline-allowed=false +jnlp.signed=false +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/src/control/AndroidWiigee.java b/src/org/wiigee/control/AndroidWiigee.java similarity index 94% rename from src/control/AndroidWiigee.java rename to src/org/wiigee/control/AndroidWiigee.java index 571a08b..3ee43e7 100644 --- a/src/control/AndroidWiigee.java +++ b/src/org/wiigee/control/AndroidWiigee.java @@ -21,12 +21,12 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package control; +package org.wiigee.control; -import device.AndroidDevice; -import event.GestureListener; -import filter.Filter; -import util.Log; +import org.wiigee.device.AndroidDevice; +import org.wiigee.event.GestureListener; +import org.wiigee.filter.Filter; +import org.wiigee.util.Log; /** * This is for using wiigee on Android Smartphones. This port has been diff --git a/src/control/WiimoteDeviceDiscovery.java b/src/org/wiigee/control/WiimoteDeviceDiscovery.java similarity index 96% rename from src/control/WiimoteDeviceDiscovery.java rename to src/org/wiigee/control/WiimoteDeviceDiscovery.java index d51ee03..84b707c 100755 --- a/src/control/WiimoteDeviceDiscovery.java +++ b/src/org/wiigee/control/WiimoteDeviceDiscovery.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package control; +package org.wiigee.control; import java.io.IOException; import java.util.Vector; @@ -32,9 +32,9 @@ import javax.bluetooth.DiscoveryListener; import javax.bluetooth.RemoteDevice; import javax.bluetooth.ServiceRecord; -import util.Log; +import org.wiigee.util.Log; -import device.Wiimote; +import org.wiigee.device.Wiimote; public class WiimoteDeviceDiscovery implements DiscoveryListener { diff --git a/src/control/WiimoteWiigee.java b/src/org/wiigee/control/WiimoteWiigee.java similarity index 96% rename from src/control/WiimoteWiigee.java rename to src/org/wiigee/control/WiimoteWiigee.java index 7bdc9c4..3843b6b 100755 --- a/src/control/WiimoteWiigee.java +++ b/src/org/wiigee/control/WiimoteWiigee.java @@ -21,7 +21,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package control; +package org.wiigee.control; import java.io.IOException; import java.util.Vector; @@ -29,11 +29,11 @@ import java.util.Vector; import javax.bluetooth.DiscoveryAgent; import javax.bluetooth.LocalDevice; -import util.Log; -import device.Wiimote; -import event.DeviceListener; -import event.GestureListener; -import filter.Filter; +import org.wiigee.util.Log; +import org.wiigee.device.Wiimote; +import org.wiigee.event.DeviceListener; +import org.wiigee.event.GestureListener; +import org.wiigee.filter.Filter; // Singleton public class WiimoteWiigee { diff --git a/src/device/AndroidDevice.java b/src/org/wiigee/device/AndroidDevice.java similarity index 80% rename from src/device/AndroidDevice.java rename to src/org/wiigee/device/AndroidDevice.java index 33f38ae..2ffbf99 100644 --- a/src/device/AndroidDevice.java +++ b/src/org/wiigee/device/AndroidDevice.java @@ -22,9 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package device; +package org.wiigee.device; -import android.hardware.SensorListener; +import android.hardware.Sensor; +import android.hardware.SensorEvent; +import android.hardware.SensorEventListener; import android.hardware.SensorManager; /** @@ -33,7 +35,7 @@ import android.hardware.SensorManager; * @author liangj01 * */ -public class AndroidDevice extends Device implements SensorListener { +public class AndroidDevice extends Device implements SensorEventListener { private float x0, y0, z0, x1, y1, z1; @@ -48,8 +50,11 @@ public class AndroidDevice extends Device implements SensorListener { } - public void onSensorChanged(int sensor, float[] values) { - if (this.accelerationEnabled() && sensor == SensorManager.SENSOR_ACCELEROMETER) { + public void onSensorChanged(SensorEvent sevent) { + Sensor sensor = sevent.sensor; + float[] values = sevent.values; + + if (this.accelerationEnabled() && sensor.getType() == SensorManager.SENSOR_ACCELEROMETER) { double x, y, z; float xraw, yraw, zraw; @@ -71,8 +76,8 @@ public class AndroidDevice extends Device implements SensorListener { } } - public void onAccuracyChanged(int arg0, int arg1) { - // TODO + public void onAccuracyChanged(Sensor arg0, int arg1) { + // Nothing to do. } } diff --git a/src/device/Device.java b/src/org/wiigee/device/Device.java similarity index 96% rename from src/device/Device.java rename to src/org/wiigee/device/Device.java index 4e6860e..0696513 100644 --- a/src/device/Device.java +++ b/src/org/wiigee/device/Device.java @@ -22,14 +22,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package device; +package org.wiigee.device; +import org.wiigee.logic.ProcessingUnit; +import org.wiigee.logic.TriggeredProcessingUnit; import java.io.IOException; import java.util.Vector; -import logic.*; -import event.*; -import filter.*; +import org.wiigee.logic.*; +import org.wiigee.event.*; +import org.wiigee.filter.*; public class Device { diff --git a/src/device/Wiimote.java b/src/org/wiigee/device/Wiimote.java similarity index 99% rename from src/device/Wiimote.java rename to src/org/wiigee/device/Wiimote.java index 38813bf..b560618 100755 --- a/src/device/Wiimote.java +++ b/src/org/wiigee/device/Wiimote.java @@ -22,14 +22,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package device; +package org.wiigee.device; import java.io.IOException; import java.util.Random; import javax.bluetooth.L2CAPConnection; import javax.microedition.io.Connector; -import event.*; -import util.Log; +import org.wiigee.event.*; +import org.wiigee.util.Log; /** * @author Benjamin 'BePo' Poppinga diff --git a/src/device/WiimoteStreamer.java b/src/org/wiigee/device/WiimoteStreamer.java similarity index 98% rename from src/device/WiimoteStreamer.java rename to src/org/wiigee/device/WiimoteStreamer.java index 43f4b5b..df596c8 100755 --- a/src/device/WiimoteStreamer.java +++ b/src/org/wiigee/device/WiimoteStreamer.java @@ -22,16 +22,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package device; +package org.wiigee.device; import java.io.IOException; import java.util.EventObject; import javax.bluetooth.L2CAPConnection; -import event.ButtonPressedEvent; -import event.ButtonReleasedEvent; -import util.Log; +import org.wiigee.event.ButtonPressedEvent; +import org.wiigee.event.ButtonReleasedEvent; +import org.wiigee.util.Log; /** * This class listens to data sended by the wiimote and generates specific diff --git a/src/event/AccelerationEvent.java b/src/org/wiigee/event/AccelerationEvent.java similarity index 97% rename from src/event/AccelerationEvent.java rename to src/org/wiigee/event/AccelerationEvent.java index d3e9f33..a313475 100755 --- a/src/event/AccelerationEvent.java +++ b/src/org/wiigee/event/AccelerationEvent.java @@ -22,11 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventObject; -import device.*; +import org.wiigee.device.*; /** * This Event would be generated if an acceleration has been detected. diff --git a/src/event/ActionStartEvent.java b/src/org/wiigee/event/ActionStartEvent.java similarity index 97% rename from src/event/ActionStartEvent.java rename to src/org/wiigee/event/ActionStartEvent.java index 0d87dde..3b77a34 100755 --- a/src/event/ActionStartEvent.java +++ b/src/org/wiigee/event/ActionStartEvent.java @@ -22,11 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventObject; -import device.Device; +import org.wiigee.device.Device; public class ActionStartEvent extends EventObject { diff --git a/src/event/ActionStopEvent.java b/src/org/wiigee/event/ActionStopEvent.java similarity index 95% rename from src/event/ActionStopEvent.java rename to src/org/wiigee/event/ActionStopEvent.java index bea3b11..492b350 100755 --- a/src/event/ActionStopEvent.java +++ b/src/org/wiigee/event/ActionStopEvent.java @@ -22,10 +22,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventObject; -import device.Device; +import org.wiigee.device.Device; public class ActionStopEvent extends EventObject { diff --git a/src/event/ButtonPressedEvent.java b/src/org/wiigee/event/ButtonPressedEvent.java similarity index 98% rename from src/event/ButtonPressedEvent.java rename to src/org/wiigee/event/ButtonPressedEvent.java index 33a1d1a..9c2f29f 100755 --- a/src/event/ButtonPressedEvent.java +++ b/src/org/wiigee/event/ButtonPressedEvent.java @@ -22,9 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; -import device.*; +import org.wiigee.device.*; /** * diff --git a/src/event/ButtonReleasedEvent.java b/src/org/wiigee/event/ButtonReleasedEvent.java similarity index 95% rename from src/event/ButtonReleasedEvent.java rename to src/org/wiigee/event/ButtonReleasedEvent.java index 168769e..4bbc92d 100755 --- a/src/event/ButtonReleasedEvent.java +++ b/src/org/wiigee/event/ButtonReleasedEvent.java @@ -22,11 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventObject; -import device.*; +import org.wiigee.device.*; /** * diff --git a/src/event/DeviceListener.java b/src/org/wiigee/event/DeviceListener.java similarity index 99% rename from src/event/DeviceListener.java rename to src/org/wiigee/event/DeviceListener.java index e5fffd2..d0931bf 100755 --- a/src/event/DeviceListener.java +++ b/src/org/wiigee/event/DeviceListener.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventListener; diff --git a/src/event/GestureEvent.java b/src/org/wiigee/event/GestureEvent.java similarity index 96% rename from src/event/GestureEvent.java rename to src/org/wiigee/event/GestureEvent.java index 1d76c48..a33b757 100755 --- a/src/event/GestureEvent.java +++ b/src/org/wiigee/event/GestureEvent.java @@ -22,9 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; -import logic.ProcessingUnit; +import org.wiigee.logic.ProcessingUnit; /** * This event would be generated if a gesture has been detected. diff --git a/src/event/GestureListener.java b/src/org/wiigee/event/GestureListener.java similarity index 98% rename from src/event/GestureListener.java rename to src/org/wiigee/event/GestureListener.java index 8266f61..12ff9d4 100755 --- a/src/event/GestureListener.java +++ b/src/org/wiigee/event/GestureListener.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventListener; diff --git a/src/event/InfraredEvent.java b/src/org/wiigee/event/InfraredEvent.java similarity index 96% rename from src/event/InfraredEvent.java rename to src/org/wiigee/event/InfraredEvent.java index f5cf7e6..dbbebeb 100755 --- a/src/event/InfraredEvent.java +++ b/src/org/wiigee/event/InfraredEvent.java @@ -22,10 +22,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventObject; -import device.Wiimote; +import org.wiigee.device.Wiimote; public class InfraredEvent extends EventObject { diff --git a/src/event/MotionStartEvent.java b/src/org/wiigee/event/MotionStartEvent.java similarity index 96% rename from src/event/MotionStartEvent.java rename to src/org/wiigee/event/MotionStartEvent.java index 4b77b54..de74010 100755 --- a/src/event/MotionStartEvent.java +++ b/src/org/wiigee/event/MotionStartEvent.java @@ -22,9 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; -import device.Device; +import org.wiigee.device.Device; public class MotionStartEvent extends ActionStartEvent { diff --git a/src/event/MotionStopEvent.java b/src/org/wiigee/event/MotionStopEvent.java similarity index 95% rename from src/event/MotionStopEvent.java rename to src/org/wiigee/event/MotionStopEvent.java index 525447d..3b7e126 100755 --- a/src/event/MotionStopEvent.java +++ b/src/org/wiigee/event/MotionStopEvent.java @@ -22,9 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; -import device.Device; +import org.wiigee.device.Device; /** * diff --git a/src/event/StateEvent.java b/src/org/wiigee/event/StateEvent.java similarity index 96% rename from src/event/StateEvent.java rename to src/org/wiigee/event/StateEvent.java index c810401..d6ffccd 100755 --- a/src/event/StateEvent.java +++ b/src/org/wiigee/event/StateEvent.java @@ -22,10 +22,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package event; +package org.wiigee.event; import java.util.EventObject; -import logic.ProcessingUnit; +import org.wiigee.logic.ProcessingUnit; /** * diff --git a/src/filter/DirectionalEquivalenceFilter.java b/src/org/wiigee/filter/DirectionalEquivalenceFilter.java similarity index 98% rename from src/filter/DirectionalEquivalenceFilter.java rename to src/org/wiigee/filter/DirectionalEquivalenceFilter.java index 06f2c4a..50cb326 100755 --- a/src/filter/DirectionalEquivalenceFilter.java +++ b/src/org/wiigee/filter/DirectionalEquivalenceFilter.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package filter; +package org.wiigee.filter; public class DirectionalEquivalenceFilter extends Filter { diff --git a/src/filter/Filter.java b/src/org/wiigee/filter/Filter.java similarity index 98% rename from src/filter/Filter.java rename to src/org/wiigee/filter/Filter.java index f715caa..6a2de99 100755 --- a/src/filter/Filter.java +++ b/src/org/wiigee/filter/Filter.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package filter; +package org.wiigee.filter; public abstract class Filter { diff --git a/src/filter/HighPassFilter.java b/src/org/wiigee/filter/HighPassFilter.java similarity index 98% rename from src/filter/HighPassFilter.java rename to src/org/wiigee/filter/HighPassFilter.java index 1423988..d6470e1 100644 --- a/src/filter/HighPassFilter.java +++ b/src/org/wiigee/filter/HighPassFilter.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package filter; +package org.wiigee.filter; /** * diff --git a/src/filter/IdleStateFilter.java b/src/org/wiigee/filter/IdleStateFilter.java similarity index 98% rename from src/filter/IdleStateFilter.java rename to src/org/wiigee/filter/IdleStateFilter.java index 8f40167..1be001c 100755 --- a/src/filter/IdleStateFilter.java +++ b/src/org/wiigee/filter/IdleStateFilter.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package filter; +package org.wiigee.filter; public class IdleStateFilter extends Filter { diff --git a/src/filter/LowPassFilter.java b/src/org/wiigee/filter/LowPassFilter.java similarity index 98% rename from src/filter/LowPassFilter.java rename to src/org/wiigee/filter/LowPassFilter.java index 9c6a88c..f61f6f7 100644 --- a/src/filter/LowPassFilter.java +++ b/src/org/wiigee/filter/LowPassFilter.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package filter; +package org.wiigee.filter; /** * diff --git a/src/filter/MotionDetectFilter.java b/src/org/wiigee/filter/MotionDetectFilter.java similarity index 97% rename from src/filter/MotionDetectFilter.java rename to src/org/wiigee/filter/MotionDetectFilter.java index 2461fc6..4b35bfe 100755 --- a/src/filter/MotionDetectFilter.java +++ b/src/org/wiigee/filter/MotionDetectFilter.java @@ -22,9 +22,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package filter; +package org.wiigee.filter; -import device.Device; +import org.wiigee.device.Device; public class MotionDetectFilter extends Filter { diff --git a/src/logic/Classifier.java b/src/org/wiigee/logic/Classifier.java similarity index 99% rename from src/logic/Classifier.java rename to src/org/wiigee/logic/Classifier.java index 3dfc612..8383cd7 100644 --- a/src/logic/Classifier.java +++ b/src/org/wiigee/logic/Classifier.java @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package logic; +package org.wiigee.logic; import java.util.Vector; diff --git a/src/logic/Gesture.java b/src/org/wiigee/logic/Gesture.java similarity index 98% rename from src/logic/Gesture.java rename to src/org/wiigee/logic/Gesture.java index 51f520a..93ce35c 100755 --- a/src/logic/Gesture.java +++ b/src/org/wiigee/logic/Gesture.java @@ -22,10 +22,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package logic; +package org.wiigee.logic; import java.util.Vector; -import event.AccelerationEvent; +import org.wiigee.event.AccelerationEvent; /** * This class represents ONE movement trajectory in a diff --git a/src/logic/GestureModel.java b/src/org/wiigee/logic/GestureModel.java similarity index 98% rename from src/logic/GestureModel.java rename to src/org/wiigee/logic/GestureModel.java index cb9238e..7236b2d 100755 --- a/src/logic/GestureModel.java +++ b/src/org/wiigee/logic/GestureModel.java @@ -22,11 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package logic; +package org.wiigee.logic; import java.util.Vector; -import event.AccelerationEvent; -import util.Log; +import org.wiigee.event.AccelerationEvent; +import org.wiigee.util.Log; /** * This Class units a Quantizer-Component and an Model-Component. diff --git a/src/logic/HMM.java b/src/org/wiigee/logic/HMM.java similarity index 99% rename from src/logic/HMM.java rename to src/org/wiigee/logic/HMM.java index f8fdfac..53fbc63 100755 --- a/src/logic/HMM.java +++ b/src/org/wiigee/logic/HMM.java @@ -22,10 +22,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package logic; +package org.wiigee.logic; import java.text.DecimalFormat; import java.util.Vector; -import util.Log; +import org.wiigee.util.Log; /** * This is a Hidden Markov Model implementation which internally provides diff --git a/src/logic/PreciseHMM.java b/src/org/wiigee/logic/PreciseHMM.java similarity index 91% rename from src/logic/PreciseHMM.java rename to src/org/wiigee/logic/PreciseHMM.java index 21dfcb2..8e50b25 100755 --- a/src/logic/PreciseHMM.java +++ b/src/org/wiigee/logic/PreciseHMM.java @@ -22,11 +22,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package logic; +package org.wiigee.logic; import java.text.*; import java.util.Vector; import java.lang.Math; -import util.Log; +import org.wiigee.util.Log; /** * This is a Hidden Markov Model implementation which internally provides @@ -248,7 +248,53 @@ public class PreciseHMM { return sf; } // calculateScalingFactor + + + // NEW + // returns s(t). + private double[] getScalingFactors(int[] sequence) { + double[][] fwd = this.forwardProc(sequence); // i t + double[] retVal = new double[fwd[0].length]; + + // init + // fixed t = 0 time + for(int i=0; i 0 time + for(int t=1; t