Mika charamel ws

.gitignore

@@ -5,6 +5,7 @@ tmp/
 /log/stickman.log
 .idea/*
 .gradle
+# Ignoring all build directories
 build/
 !plugins/studymaster-web/src/main/resources/react-studymaster/build
 

README.md

@@ -1,6 +1,6 @@
 # Visual Scene Maker Master Version
 
-(c) 2003-18. All rights reserved
+(c) 2003-21. All rights reserved
 
 ### Download the current version at: https://github.com/SceneMaker/VisualSceneMaker/releases
 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'org.openjfx.javafxplugin' version '0.0.10'
-    id 'net.nemerosa.versioning' version '2.8.2'
+    id 'net.nemerosa.versioning' version '3.0.0'
     id 'com.github.johnrengelman.shadow' version '5.0.0'
 }
 javadoc { options.encoding = 'UTF-8' }
@@ -30,15 +30,21 @@ dependencies {
     implementation fileTree(dir: 'lib', include: "*.jar")
     implementation project(":plugins:AndroidGui")
     implementation project(":plugins:studymaster-web")
+    implementation project(":plugins:emma-user-model")
     implementation project(":plugins:decad")
+    implementation project(":plugins:htmlgui-ws")
+    implementation project(":plugins:odp")
     implementation project(":plugins:yallah")
     implementation project(":plugins:ssi")
+    implementation project(":plugins:ssj")
     implementation project(":plugins:reeti")
+    implementation project(":plugins:timer")
     implementation project(":plugins:tricatworld")
     implementation project(":plugins:charamel")
-    implementation project(":plugins:VLCRemoteController")
+    implementation project(":plugins:charamel-ws")
     implementation project(":plugins:extensionAPI")
-
+    implementation project(":plugins:sockets")
+    implementation project(":plugins:DriveSimulator")
     implementation 'org.jetbrains:annotations:16.0.2'
     // https://mvnrepository.com/artifact/org.slick2d/slick2d-core
     implementation group: 'org.slick2d', name: 'slick2d-core', version: '1.0.2' // needed for documentation

core/build.gradle

@@ -13,7 +13,9 @@ if(!project.hasProperty('flavor')){
 
     println("Building jar for ANDROID")
 }
-
+compileJava{
+   //options.release = 8
+}
 repositories {
     mavenCentral()
     maven { url "https://repo.spring.io/libs-release" }

core/src/main/java/de/dfki/vsm/event/EventDispatcher.java

@@ -29,7 +29,7 @@ private EventDispatcher() {
         mTimer = new Timer("EventCasterTimer");
         //
         mListenerList
-                = new CopyOnWriteArrayList();
+                = new CopyOnWriteArrayList<>();
     }
 
     // Get The Singelton Instance

core/src/main/java/de/dfki/vsm/runtime/activity/SpeechActivity.java

@@ -1,6 +1,8 @@
 package de.dfki.vsm.runtime.activity;
 
+import de.dfki.vsm.model.scenescript.SceneTurn;
 import de.dfki.vsm.util.log.LOGConsoleLogger;
+
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Properties;
@@ -15,23 +17,40 @@ public final class SpeechActivity extends AbstractActivity {
             = LOGConsoleLogger.getInstance();
 
     // The list of blocks
-    private LinkedList mBlocks;
+    private LinkedList<String> mBlocks;
     // The punctuation mark
     private final String mPunct;
+    // Turn information
+    private final SceneTurn mTurn;
+    private final int mTurnNum;
+    private final int mTotalTurns;
+    // Utterance information
+    private final int mUtteranceNum;
+    private final int mTotalUtterances;
 
     // Construct the activity
     public SpeechActivity(
             final String actor,
-            final LinkedList list,
-            final String punct) {
+            final LinkedList<String> list,
+            final String punct,
+            final SceneTurn turn,
+            final int turn_num,
+            final int total_turns,
+            final int utterance_num,
+            final int total_utterances) {
         super(Type.blocking, actor, /*"speech",*/ "speak");
         // Initialize the content
         mBlocks = list;
         mPunct = punct;
+        mTurn = turn;
+        mTurnNum = turn_num;
+        mTotalTurns = total_turns;
+        mUtteranceNum = utterance_num;
+        mTotalUtterances = total_utterances;
     }
 
     // Get the text and time mark blocks (added by PG)
-    public final LinkedList getBlocks() {
+    public final LinkedList<String> getBlocks() {
         return mBlocks;
     }
 
@@ -40,7 +59,12 @@ public final String getPunct() {
         return mPunct;
     }
 
-    // Get the text only - without time mark blocks (added by PG)
+    /**
+     * Get the text only - without time mark blocks (added by PG)
+     *
+     * @param markerSign The beginning of the marker
+     * @return The text without speech markers
+     */
     public final String getTextOnly(final String markerSign) {
         final StringBuilder builder = new StringBuilder();
         for (final Object item : mBlocks) {
@@ -56,17 +80,21 @@ public final String getTextOnly(final String markerSign) {
         return builder.toString();
     }
 
-    // Do pronounciation mapping for a better text to speech output. (added by PG - 2.5.2016)
-    public final void doPronounciationMapping(Properties pronounciationMap) {
-        if (pronounciationMap == null) {
+    /**
+     * Do pronounciation mapping for a better text to speech output.
+     *
+     * @author PG - 2.5.2016
+     */
+    public final void doPronounciationMapping(Properties pronunciationMap) {
+        if (pronunciationMap == null) {
             return;
         }
 
         LinkedList replaced = new LinkedList();
         for (final Object item : mBlocks) {
             String text = item.toString();
             //mLogger.success("text to be checked and maybe replaced " + text);
-            for (Map.Entry<Object, Object> entry : pronounciationMap.entrySet()) {
+            for (Map.Entry<Object, Object> entry : pronunciationMap.entrySet()) {
                 if (text != null && entry.getKey() != null && entry.getValue() != null) {
                     text = text.replaceAll("\\b" + entry.getKey() + "\\b", (String) entry.getValue());
                 }
@@ -77,7 +105,13 @@ public final void doPronounciationMapping(Properties pronounciationMap) {
         mBlocks = replaced;
     }
 
-// Get the punctuation information (added by PG 20.4.2016)
+    /**
+     * Get the punctuation information
+     *
+     * @param markerSign The beginning of the marker
+     * @return
+     * @author PG 20.4.2016
+     */
     public final LinkedList<String> getTimeMarks(final String markerSign) {
         final LinkedList<String> tms = new LinkedList<>();
         for (final Object item : mBlocks) {
@@ -89,7 +123,57 @@ public final LinkedList<String> getTimeMarks(final String markerSign) {
         return tms;
     }
 
-    // Get textual representation
+    /**
+     * Get the actual turn number (as index)
+     *
+     * @return
+     */
+    public final int getTurnNumber() {
+        return mTurnNum;
+    }
+
+    /**
+     * Get the total turn numbers
+     *
+     * @return
+     */
+    public final int getTotalTurns() {
+        return mTotalTurns;
+    }
+
+    /**
+     * Get the actual utterance number (as index)
+     *
+     * @return
+     */
+    public final int getUtteranceNumber() {
+        return mUtteranceNum;
+    }
+
+    /**
+     * Get the total utterances number
+     *
+     * @return
+     */
+    public final int getTotalUtterances() {
+        return mTotalUtterances;
+    }
+
+    /**
+     * Get the whole SceneTurn object
+     *
+     * @return
+     */
+    public final SceneTurn getSceneTurn() {
+        return mTurn;
+    }
+
+
+    /**
+     * Get textual representation
+     *
+     * @return
+     */
     @Override
     public final String getText() {
         final StringBuilder builder = new StringBuilder();

core/src/main/java/de/dfki/vsm/runtime/activity/scheduler/ActivityScheduler.java

@@ -42,8 +42,12 @@ public final void handle(final String marker) {
         //}
     }
 
-    public final boolean hasMarker(final String marker) {
-        return mWorkerMap.containsKey(marker) ;
+
+    //Check if there is an marker / activity.
+    public boolean hasMarker(String marker) {
+        synchronized (mWorkerMap) {
+            return mWorkerMap.containsKey(marker);
+        }
     }
 
     // Schedule an activity on an executor with a timeout

core/src/main/java/de/dfki/vsm/runtime/player/ReactivePlayer.java

@@ -77,7 +77,7 @@ public final void playAction(final String text, final List<AbstractValue> args)
         // Make unique worker name
         final String task = process.getName() + ":" + text + "@";
         // Translate the arguments
-        final HashMap substitutions = getSubstitutions(args);
+        final HashMap<String, String> substitutions = getSubstitutions(args);
         // Print some information
         //mLogger.message("Playing Action '" + text + "' in process '" + process + "' on reactive player '" + this + "' with substitutions '" + substitutions.toString() + "'");
         // Create playback task
@@ -96,8 +96,8 @@ public void run() {
 
                 if (syntax.startsWith("[") && syntax.endsWith("]")) {
                     // PG: changed action and action feature parser to be more powerful
-                    // matching something like: agent Action x=2.5 y=0.0 z=-13.0 w=3.4254345E-5 text='Someone wants a beer!' other=bad some='things' state='Da=fuck.continued and others']
-                    final Pattern pattern = Pattern.compile("^\\w+|\\w+\\s|\\w+]|[a-zA-Z-_]+=[a-zA-Z][a-zA-Z-_]+|\\w+=-?[0-9.]+E-?[0-9]+|\\w+=-?[0-9.]+|\\w+='[\\wäöüßÄÖÜ\\s:.,!?=@/]+'");
+                    // matching something like: agent Action x=2.5 y=0.0 z=-13.0 w=3.4254345E-5 text='Someone wants a beer!' other=bad some='things' state='Da=fuck.continued and -others']
+                    final Pattern pattern = Pattern.compile("^\\w+|\\w+\\s|\\w+]|[a-zA-Z-_]+=[a-zA-Z-_]+|\\w+=-?[0-9.]+E-?[0-9]+|\\w+=-?[0-9.]+|\\w+='[\\wäöüßÄÖÜ\\-\\s:.,!?=@/]+'");
                     final Matcher matcher = pattern.matcher(syntax);
                     while (matcher.find()) {
                         final String token = matcher.group().trim();
@@ -151,7 +151,7 @@ public final void playScene(final String name, final List<AbstractValue> args) t
         // Make unique worker name
         final String task = process.getName() + ":" + name + "@";
         // Translate the arguments
-        final HashMap substitutions = getSubstitutions(args);
+        final HashMap<String, String> substitutions = getSubstitutions(args);
         // Print some information
         mLogger.message("Playing Scene '" + name + "' in process '" + process + "' on reactive player '" + this + "' with substitutions '" + substitutions.toString() + "'");
 
@@ -176,15 +176,30 @@ public final void playScene(final String name, final List<AbstractValue> args) t
 
             @Override
             public void run() {
+                // numerical turn information
+                int turn_cnt = 0;
+                int turn_number = scene.getTurnList().size();
+
                 for (SceneTurn turn : scene.getTurnList()) {
+                    // increment turn_cnt;
+                    turn_cnt++;
+
                     // Get executor for this turn
                     final ActivityExecutor turnActorExecutor = mProject.getAgentDevice(turn.getSpeaker());
+
+                    // numerical utterance information
+                    int utterance_cnt = 0;
+                    int utterance_number = turn.getUttrList().size();
+
                     // Serially play the utterances
                     for (SceneUttr uttr : turn.getUttrList()) {
+                        // increment utterance_cnt;
+                        utterance_cnt++;
 
                         //mLogger.message("Utterance " + uttr.getText().trim());
-                        final LinkedList<String> textBuilder = new LinkedList();
-                        final LinkedList<ActivityWorker> observedWorkerList = new LinkedList();
+                        final LinkedList<String> textBuilder = new LinkedList<>();
+                        final LinkedList<ActivityWorker> observedWorkerList = new LinkedList<>();
+
                         for (final UttrElement element : uttr.getWordList()) {
                             //mLogger.message("element " + element);
 
@@ -194,9 +209,9 @@ public void run() {
                                 final String actor = action.getActor();
                                 // Get the executor for this action
                                 final ActivityExecutor actionActorExecutor
-                                        = (actor != null ? mProject.getAgentDevice(actor) : turnActorExecutor);
+                                        = (actor != null && !actor.isEmpty() ? mProject.getAgentDevice(actor) : turnActorExecutor);
                                 // Create a new marker for the action
-                                // 19.4.2016 PG: CAREFULL! The marker has to be generated by the turn executor! not by the activity executor of the action!
+                                // 19.4.2016 PG: CAREFULLY! The marker has to be generated by the turn executor! not by the activity executor of the action!
                                 //Old: final String marker = actionActorExecutor.marker(newId());
                                 final String marker = turnActorExecutor.marker(newId());
                                 // Append the marker to the activity
@@ -237,7 +252,12 @@ public void run() {
                                 new SpeechActivity(
                                         turn.getSpeaker(),
                                         textBuilder,
-                                        punctuation),
+                                        punctuation,
+                                        turn,
+                                        turn_cnt,
+                                        turn_number,
+                                        utterance_cnt,
+                                        utterance_number),
                                 turnActorExecutor);
                         // Check for interruption
                         if (isDone()) {
@@ -275,8 +295,8 @@ public void run() {
     }
 
     // Translate the arguments
-    private HashMap getSubstitutions(final List<AbstractValue> args) {
-        final HashMap substitutions = new HashMap();
+    private HashMap<String, String> getSubstitutions(final List<AbstractValue> args) {
+        final HashMap<String, String> substitutions = new HashMap<>();
         if (args != null && !args.isEmpty()) {
             for (final Object object : args) {
                 if (object instanceof AbstractValue) {