From 730f242c853f69f14234fe28e6547fc92167fa00 Mon Sep 17 00:00:00 2001
From: BBQ <renboqi@gmail.com>
Date: Thu, 15 Aug 2019 16:08:53 +0200
Subject: [PATCH] add preference

---
 eraser.starter/starter-setting.yaml                        | 7 ++++---
 .../feedbackloop.learner_backup/MachineLearningImpl.java   | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eraser.starter/starter-setting.yaml b/eraser.starter/starter-setting.yaml
index 6882f55d..7a8c771a 100644
--- a/eraser.starter/starter-setting.yaml
+++ b/eraser.starter/starter-setting.yaml
@@ -37,10 +37,11 @@ activity:
 
 # Model for preference learning. If dummy is true, then the file parameter is ignored.
 preference:
-  factory: de.tudresden.inf.st.eraser.starter.TestMachineLearningHandlerFactory
+  factory: de.tudresden.inf.st.eraser.feedbackloop.learner_backup.MachineLearningHandlerFactoryImpl
+ # factory: de.tudresden.inf.st.eraser.starter.TestMachineLearningHandlerFactory
   # File to read in. Expected format depends on factory
-  file: src/main/resources/testHandler.properties
-#  file: ../datasets/backup/preference_data.csv
+#  file: src/main/resources/testHandler.properties
+  file: ../datasets/backup/preference_data.csv
   external: true
   # Use dummy model in which the current activity is directly editable. Default: false.
   dummy: false
diff --git a/feedbackloop.learner_backup/src/main/java/de/tudresden/inf/st/eraser/feedbackloop.learner_backup/MachineLearningImpl.java b/feedbackloop.learner_backup/src/main/java/de/tudresden/inf/st/eraser/feedbackloop.learner_backup/MachineLearningImpl.java
index 65005d8b..77d1fd89 100644
--- a/feedbackloop.learner_backup/src/main/java/de/tudresden/inf/st/eraser/feedbackloop.learner_backup/MachineLearningImpl.java
+++ b/feedbackloop.learner_backup/src/main/java/de/tudresden/inf/st/eraser/feedbackloop.learner_backup/MachineLearningImpl.java
@@ -104,7 +104,6 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
              or let knowledge base pass all relevant items <- push model
     */
     if (this.goal == GOAL_ACTIVITY_PHONE_AND_WATCH) {
-
       for (Item item : changedItems) {
         if(item.getID().equals("m_accel_x"))
         {
@@ -125,7 +124,7 @@ public class MachineLearningImpl implements MachineLearningDecoder, MachineLearn
             empty = true;
           }
         }
-        if(!empty){
+        if(!empty){logger.info("debug_activity_new_data");
           this.activity_result = learner.activity_predictor(a_new_data);
         }
         a_length = 0;
-- 
GitLab