Changeset 34785

Timestamp:

2021-02-01T17:49:17+13:00 (3 years ago)

Author:

davidb

Message:

Java code now moved into org.greenstone.mars package hierarchy

Location:

main/trunk/model-sites-dev/mars

Files:

• CLEAN-JAVA-ALL.sh (modified) (1 diff)
• COMPILE-JAVA-ALL.sh (modified) (1 diff)
• RUN-APPLY-AROUSAL-MODEL.sh (modified) (1 diff)
• RUN-TRAIN-AROUSAL-MODEL.sh (modified) (1 diff)
• src/java/org/greenstone/mars/WekaApplyArousalModel.java (modified) (1 diff)
• src/java/org/greenstone/mars/WekaTrainArousalModel.java (modified) (1 diff)

main/trunk/model-sites-dev/mars/CLEAN-JAVA-ALL.sh

@@ -1 +1 @@
 #!/bin/bash
 
-/bin/rm src/java/*.class
+/bin/rm src/java/org/greenstone/mars/*.class
 

main/trunk/model-sites-dev/mars/COMPILE-JAVA-ALL.sh

@@ -3 +3 @@
 . ./_set_weka_classpath.bash
 
-javac -cp "$cp_args" -d src/java -s src/java src/java/*.java
+cd src/java \
+   && javac -cp "$cp_args" org/greenstone/mars/*.java
 

main/trunk/model-sites-dev/mars/RUN-APPLY-AROUSAL-MODEL.sh

@@ -6 +6 @@
 . ./_set_weka_classpath.bash
 
-java -cp "$cp_args" WekaApplyArousalModel \
+java -cp "$cp_args" org.greenstone.mars.WekaApplyArousalModel \
      "reptree-arousal-serialized.model" \
      "$input_data_filename" \

main/trunk/model-sites-dev/mars/RUN-TRAIN-AROUSAL-MODEL.sh

@@ -3 +3 @@
 . ./_set_weka_classpath.bash
 
-java -cp "$cp_args" \
-     WekaTrainArousalModel "collect/deam/etc/deam-essentia-features-arousal-valence.arff" "reptree-arousal-serialized.model"
+java -cp "$cp_args" org.greenstone.mars.WekaTrainArousalModel \
+     "collect/deam/etc/deam-essentia-features-arousal-valence.arff" \
+     "reptree-arousal-serialized.model"
 
     

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars/WekaApplyArousalModel.java

@@ +1 @@
+package org.greenstone.mars;
+
 //import java.util.Random;
 

main/trunk/model-sites-dev/mars/src/java/org/greenstone/mars/WekaTrainArousalModel.java

@@ +1 @@
+package org.greenstone.mars;
+    
 import java.util.Random;