diff --git a/src/main/java/org/opennars/applications/crossing/Entity.java b/src/main/java/org/opennars/applications/crossing/Entity.java
index 85b6532a1da69becb664b869d1d779fd41066319..12ccf2eb08b0e1717e8ec82b02008922ed83b2fa 100755
--- a/src/main/java/org/opennars/applications/crossing/Entity.java
+++ b/src/main/java/org/opennars/applications/crossing/Entity.java
@@ -129,13 +129,12 @@ public class Entity {
}
if(!isPredicted) {
//applet.rect((float) (0.0f-width/2.0f), (float) (0.0f-height/2.0f), (float) width, (float) height);
- float mul2 = 2.0f;
+ float mul2 = 1.0f; //80.0f/100.0f;
if(RealCrossing.running) {
- applet.ellipse(2.5f, 2.5f, Util.discretization*scale*mul2, Util.discretization*scale*mul2);
+ applet.ellipse(0.0f, 0.0f, Util.discretization*scale*mul2, Util.discretization*scale*mul2);
} else {
applet.ellipse(2.5f, 2.5f, Util.discretization*scale, Util.discretization*scale);
}
-
}
if(RealCrossing.running) {
diff --git a/src/main/java/org/opennars/applications/crossing/OperatorPanel.form b/src/main/java/org/opennars/applications/crossing/OperatorPanel.form
index 18b2cf99591cc7a54260ec13692df9b14ef315b2..512198a0312300f095a4a5e318301c8d95d49872 100755
--- a/src/main/java/org/opennars/applications/crossing/OperatorPanel.form
+++ b/src/main/java/org/opennars/applications/crossing/OperatorPanel.form
@@ -112,17 +112,19 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane5" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="saveQANarButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="stopSaveQANarButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Group type="103" alignment="3" groupAlignment="3" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="103" alignment="0" groupAlignment="3" attributes="0">
+ <Component id="savePredictionNarButton" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="stopSavePredictionNarButton" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="logOutputCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Group type="103" groupAlignment="3" attributes="0">
<Component id="saveLocationNarButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="stopSaveLocationNarButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Group type="103" alignment="3" groupAlignment="3" attributes="0">
- <Component id="savePredictionNarButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="stopSavePredictionNarButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="logOutputCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
+ </Group>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="saveQANarButton" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="stopSaveQANarButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="23" max="32767" attributes="0"/>
diff --git a/src/main/java/org/opennars/applications/crossing/OperatorPanel.java b/src/main/java/org/opennars/applications/crossing/OperatorPanel.java
index d293e328ccfc49f9595da1656efcf676bd1b16dd..706b2bfa9ce544524dc44af17e8eef2facd0e41c 100755
--- a/src/main/java/org/opennars/applications/crossing/OperatorPanel.java
+++ b/src/main/java/org/opennars/applications/crossing/OperatorPanel.java
@@ -351,16 +351,18 @@ public class OperatorPanel extends javax.swing.JFrame {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(saveQANarButton)
- .addComponent(stopSaveQANarButton)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(saveLocationNarButton)
- .addComponent(stopSaveLocationNarButton)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(savePredictionNarButton)
.addComponent(stopSavePredictionNarButton)
- .addComponent(logOutputCheckBox))))
+ .addComponent(logOutputCheckBox))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(saveLocationNarButton)
+ .addComponent(stopSaveLocationNarButton)))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(saveQANarButton)
+ .addComponent(stopSaveQANarButton)))
.addContainerGap(23, Short.MAX_VALUE))
);
diff --git a/src/main/java/org/opennars/applications/crossing/RealCrossing/InformLocationNar.java b/src/main/java/org/opennars/applications/crossing/RealCrossing/InformLocationNar.java
index 2651d822f4ced502c514f5bae0b6697fb2b5216b..a6212fe33c90b7136df2d6a3d065654a596035c8 100755
--- a/src/main/java/org/opennars/applications/crossing/RealCrossing/InformLocationNar.java
+++ b/src/main/java/org/opennars/applications/crossing/RealCrossing/InformLocationNar.java
@@ -55,9 +55,6 @@ public class InformLocationNar {
info.add(typeInfo);
locationNar.addInput(typeInfo);
//also give info about position at labelled locations
- int X = (int) (ent.posX / Util.discretization);
- int Y = (int) (ent.posY / Util.discretization);
- String subj = X + "_" + Y;
String locationnarInput = "<(*,"+EntityToNarsese.name(ent)+","+Util.positionToTerm((int)ent.posX,(int)ent.posY)+") --> at>. :|:";
locationNar.addInput(locationnarInput);
System.out.println("location nar input: " + locationnarInput);
diff --git a/src/main/java/org/opennars/applications/crossing/RealCrossing/RealCrossing.java b/src/main/java/org/opennars/applications/crossing/RealCrossing/RealCrossing.java
index 3288ce09eff7c50836e864399abf95845035efe3..8f3fc821f3d40fb78ef0ba346b5b20dfbb884343 100755
--- a/src/main/java/org/opennars/applications/crossing/RealCrossing/RealCrossing.java
+++ b/src/main/java/org/opennars/applications/crossing/RealCrossing/RealCrossing.java
@@ -343,7 +343,7 @@ public class RealCrossing extends PApplet {
//</editor-fold>
System.out.println("args: videopath trackletpath [discretization movementThreshold]");
System.out.println("example: java -cp \"*\" org.opennars.applications.crossing.RealCrossing /mnt/sda1/Users/patha/Downloads/Test/Test/Test001/ /home/tc/Dateien/CROSSING/Test001/ 100 10");
- Util.discretization = 50;
+ Util.discretization = 80;
if(args.length == 2) {
RealCrossing.videopath = args[0];
RealCrossing.trackletpath = args[1];