From 1ce7c20213a2d2370dd3e4a04ea4db9788cb8f3c Mon Sep 17 00:00:00 2001 From: Patrick Hammer Date: Tue, 9 Jul 2019 08:34:53 +0000 Subject: [PATCH 1/2] Update: RealCrossing: Finalized. --- src/main/java/org/opennars/applications/crossing/Entity.java | 5 ++--- .../crossing/RealCrossing/InformLocationNar.java | 3 --- .../applications/crossing/RealCrossing/RealCrossing.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opennars/applications/crossing/Entity.java b/src/main/java/org/opennars/applications/crossing/Entity.java index 85b6532..12ccf2e 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 void draw(PApplet applet, TruthValue truth, long time) { } 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/RealCrossing/InformLocationNar.java b/src/main/java/org/opennars/applications/crossing/RealCrossing/InformLocationNar.java index 2651d82..a6212fe 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 @@ void inform(List entities) { 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 3288ce0..8f3fc82 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 static void main(String[] args) { // 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]; From f8b2365ed9c7ed69aeebcb59a2fad96af1876e80 Mon Sep 17 00:00:00 2001 From: Patrick Hammer Date: Tue, 9 Jul 2019 09:34:52 +0000 Subject: [PATCH 2/2] Update: RealCrossing: OperatorPanel stretched down. --- .../applications/crossing/OperatorPanel.form | 20 ++++++++++--------- .../applications/crossing/OperatorPanel.java | 16 ++++++++------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/opennars/applications/crossing/OperatorPanel.form b/src/main/java/org/opennars/applications/crossing/OperatorPanel.form index 18b2cf9..512198a 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 @@ - - - - + + + + + + + - - - - - + + + + diff --git a/src/main/java/org/opennars/applications/crossing/OperatorPanel.java b/src/main/java/org/opennars/applications/crossing/OperatorPanel.java index d293e32..706b2bf 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 void actionPerformed(java.awt.event.ActionEvent evt) { .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)) );