162 prepare on device training #182

tfiedlerdev · 2022-05-04T13:58:57Z

Closes #162
The user can now add new use cases via the usecasedialog:

Closes #163
The user can now enable an on device training screen, which also displays a summary of recordings in the selected subdir of the current usecase

Foundation for #161

…device-training-screen # Conflicts: # app/src/main/java/sensors_in_paradise/sonar/MainActivity.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/RecordingMetadataStorage.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/ClickableCarouselTextView.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/EditableRecording.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/IntervalLooper.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/ItemClickableMotionLayout.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/LabelTouchListener.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/LabelsEditorDialog.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/VideoViewHolder.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/VisualSequenceViewHolder.kt

…o 161-support-multiple-models

…g-screen # Conflicts: # app/src/main/java/sensors_in_paradise/sonar/GlobalValues.kt # app/src/main/java/sensors_in_paradise/sonar/JSONStorage.kt # app/src/main/java/sensors_in_paradise/sonar/MainActivity.kt # app/src/main/java/sensors_in_paradise/sonar/PageInterface.kt # app/src/main/java/sensors_in_paradise/sonar/page2/RecordingDataManager.kt # app/src/main/java/sensors_in_paradise/sonar/screen_prediction/PredictionScreen.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/RecordingScreen.kt

…o 161-support-multiple-models # Conflicts: # app/src/main/java/sensors_in_paradise/sonar/util/use_cases/UseCaseDialog.kt

…g-screen # Conflicts: # app/src/main/java/sensors_in_paradise/sonar/MainActivity.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/RecordingScreen.kt

… in training screen and recording screen

# Conflicts: # app/build.gradle # app/src/main/java/sensors_in_paradise/sonar/GlobalValues.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/CameraManager.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/RecordingScreen.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/CameraManager.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/ImageProcessor.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/MoveNet.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/PoseDetector.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/PoseEstimationStorageManager.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/VisualizationUtils.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/data/BodyPart.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/data/Device.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/data/KeyPoint.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/data/Person.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/data/PoseSequence.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/camera/pose_estimation/data/TorsoAndBodyDistance.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/LabelsEditorDialog.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/PoseSequenceViewHolder.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/labels_editor/VisualSequenceViewHolder.kt

lucasliebe

Please review my comments, then I will make another review after being re-requested

Some are not necessary to change if there are arguments for it but all should definitely be looked at

lucasliebe · 2022-05-05T06:31:13Z

app/src/main/java/sensors_in_paradise/sonar/GlobalValues.kt

@@ -90,5 +64,29 @@ class GlobalValues private constructor() {

            return minutes.toString().padStart(2, '0') + ":" + seconds.toString().padStart(2, '0')
        }
+        fun getMacAddress(): String {


Why do we need the Device Mac Address for On Device Training? What is the benefit?

I saw the usage but I am not entirely sure

I get your point but I can imagine a situation where one would like to know on which device the model was trained and as it does no harm, I'd just keep it now

app/src/main/java/sensors_in_paradise/sonar/screen_prediction/PredictionScreen.kt

lucasliebe · 2022-05-05T07:12:20Z

app/src/main/java/sensors_in_paradise/sonar/screen_prediction/PredictionScreen.kt

@@ -217,17 +206,38 @@ class Page3Handler(
        predictionButton = activity.findViewById(R.id.button_start_predict)
        progressBar = activity.findViewById(R.id.progressBar_nextPrediction_predictionFragment)
        predictionButton.setOnClickListener {
-            togglePrediction()
+            if (currentUseCase.getModelFile().exists()) {


maybe you can use the function initModelFromUseCase with boolean return value to prevent a double check of the file

lucasliebe · 2022-05-05T07:23:57Z

app/src/main/java/sensors_in_paradise/sonar/screen_prediction/TFLiteModel.kt

+
+class TFLiteModel(tfLiteModelFile: File, inputShape: IntArray, outputSize: Int) {
+    private val outputs = arrayOf(FloatArray(outputSize))
+    // TODO replace interpreter in PredictionScreen by this wrapper


Please dont leave todos in commits that will get into the master branch rather turn them into issues

This seems to be done anyway

app/src/main/java/sensors_in_paradise/sonar/screen_recording/RecordingScreen.kt

app/src/main/java/sensors_in_paradise/sonar/screen_recording/CategoryItemStorage.kt

lucasliebe · 2022-05-05T08:33:17Z

app/src/main/java/sensors_in_paradise/sonar/use_cases/UseCaseStorage.kt

+    override fun onJSONInitialized() {
+    }
+
+    /*fun duplicateUseCaseData(originalTitle: String, duplicateTitle: String){


please no unused uncommented functions ;)

lucasliebe · 2022-05-05T09:28:33Z

app/src/main/java/sensors_in_paradise/sonar/screen_train/TrainingScreen.kt

+            )
+        }
+
+        val dataSet = PieDataSet(entries, "Election Results")


Election results?

app/src/main/java/sensors_in_paradise/sonar/screen_train/TrainingScreen.kt

lucasliebe · 2022-05-05T09:39:45Z

app/src/main/java/sensors_in_paradise/sonar/use_cases/UseCase.kt

+        return subDirs
+    }
+
+    fun saveModelFromBuffer(buffer: MappedByteBuffer) {


lucasliebe

this pr now can be merged from my perspective

just make sure we have an old working branch for the lab please! (ask alex before pressing the green button)

lucasliebe

I just found a bug!

When you just start the app, record some sensors and start a recording without caring about use cases the app crashes.

tfiedlerdev and others added 30 commits April 22, 2022 08:42

Add screen and tab for on device training

ea1a608

Make training screen optional

9e78e2d

Prepare onDeviceTrainingScreen

74969fe

init useCases

14061c6

Populate on-device-training screen

97b0c03

further implements default useCase

b8080cf

Add training history

5778220

init useCases

95e51ff

adds use case selection dialog and refactors global values

905dc9f

Refactor activity labels storage

b53829b

Merge remote-tracking branch 'origin/161-support-multiple-models' int…

d4bb9c8

…o 161-support-multiple-models

make it work

facf4ba

Merge remote-tracking branch 'origin/161-support-multiple-models' int…

ac3aad0

…o 161-support-multiple-models

makes use case dir

05abce1

Improve

c9fc0f7

makes use case dir

5eff1f1

makes use case dir

565a539

Merge remote-tracking branch 'origin/161-support-multiple-models' int…

48dcfe2

…o 161-support-multiple-models

Satisfy @alexanderwischmann

0f931be

Fix neutral button

367f99b

remove unused imports

f0a5bfb

makes use case recordings subDir

06ad5a5

Merge remote-tracking branch 'origin/161-support-multiple-models' int…

6e41344

…o 161-support-multiple-models # Conflicts: # app/src/main/java/sensors_in_paradise/sonar/util/use_cases/UseCaseDialog.kt

Merge branch '161-support-multiple-models' into 163-on-device-trainin…

649db67

…g-screen # Conflicts: # app/src/main/java/sensors_in_paradise/sonar/MainActivity.kt # app/src/main/java/sensors_in_paradise/sonar/screen_recording/RecordingScreen.kt

Satisfy Linter and resolve post merge problems

883562c

Improve subdir logic

ac39d4d

makes use case recordings subDir persistent in use case storage

dcf2a71

Adapt training screen to use case concept

7befa13

treyfel and others added 13 commits April 29, 2022 14:11

satisfy linter

4a7be3d

Work on making use cases deletable and clonable

e848f79

Work on Use Case Dialog

adbede8

Fix bugs in UseCaseDialog.kt and react to changes in use case sub dir…

bf7bcd1

… in training screen and recording screen

Satisfy Linter (a bit)

a49a90d

refactors use case storage

3572d04

completes use case storage refactoring

0599396

satisfy linter

a70b072

implements default(HAR) prediction

263f3e4

Refactor

2ce6eb2

Refactor

3f2d58f

Satisfy linter, fix merge errors

b1cbcb1

tfiedlerdev assigned tfiedlerdev and treyfel May 4, 2022

tfiedlerdev added 2 commits May 4, 2022 16:01

Improve layout

6b8741b

Remove global recordings subdir preference. It's now use case local

66d3641

tfiedlerdev requested a review from lucasliebe May 4, 2022 14:08

lucasliebe requested changes May 5, 2022

View reviewed changes

tfiedlerdev added 3 commits May 5, 2022 14:02

Remove unnecessary parameter

88e02da

Satisfy Chefe

2d8302b

Satisfy Chefe even more

3778d8e

tfiedlerdev requested a review from lucasliebe May 5, 2022 13:26

lucasliebe approved these changes May 5, 2022

View reviewed changes

lucasliebe requested changes May 6, 2022

View reviewed changes

Fix bug

42d221a

tfiedlerdev requested a review from lucasliebe May 6, 2022 08:34

lucasliebe approved these changes May 6, 2022

View reviewed changes

tfiedlerdev merged commit 5597c0d into master May 6, 2022

tfiedlerdev deleted the 162-prepare-on-device-training branch May 6, 2022 11:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

162 prepare on device training #182

162 prepare on device training #182

tfiedlerdev commented May 4, 2022

lucasliebe left a comment

lucasliebe May 5, 2022

tfiedlerdev May 5, 2022

lucasliebe May 5, 2022

lucasliebe May 5, 2022

lucasliebe May 5, 2022

lucasliebe May 5, 2022

lucasliebe May 5, 2022

lucasliebe left a comment

lucasliebe left a comment

162 prepare on device training #182

162 prepare on device training #182

Conversation

tfiedlerdev commented May 4, 2022

lucasliebe left a comment

Choose a reason for hiding this comment

lucasliebe May 5, 2022

Choose a reason for hiding this comment

tfiedlerdev May 5, 2022

Choose a reason for hiding this comment

lucasliebe May 5, 2022

Choose a reason for hiding this comment

lucasliebe May 5, 2022

Choose a reason for hiding this comment

lucasliebe May 5, 2022

Choose a reason for hiding this comment

lucasliebe May 5, 2022

Choose a reason for hiding this comment

lucasliebe May 5, 2022

Choose a reason for hiding this comment

lucasliebe left a comment

Choose a reason for hiding this comment

lucasliebe left a comment

Choose a reason for hiding this comment