From 0e125a0c2231e7ffc3511264ef33964430dc268f Mon Sep 17 00:00:00 2001
From: PtrMan <robertw89@googlemail.com>
Date: Tue, 12 Mar 2019 12:30:06 +0100
Subject: [PATCH] Update: Metric: force
---
.../java/org/opennars/lab/metric/MetricReporter.java | 4 ++--
.../java/org/opennars/lab/metric/MetricSensor.java | 2 +-
src/main/java/org/opennars/lab/microworld/Pong.java | 12 ++++++------
.../java/org/opennars/lab/microworld/SimNAR.java | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/opennars/lab/metric/MetricReporter.java b/src/main/java/org/opennars/lab/metric/MetricReporter.java
index 4e83022e3..7e5ef8a5b 100644
--- a/src/main/java/org/opennars/lab/metric/MetricReporter.java
+++ b/src/main/java/org/opennars/lab/metric/MetricReporter.java
@@ -21,7 +21,7 @@ public class MetricReporter {
public void sendFromAllSensors() {
for(final MetricSensor iSensor : sensors) {
- String valueAsString = iSensor.getValueAsString();
+ String valueAsString = iSensor.getValueAsString(false);
if (valueAsString != null) {
send(valueAsString, iSensor.getName());
@@ -36,7 +36,7 @@ public class MetricReporter {
// forces sensors to send their data - preferably called every second
public void sendFromAllSensorsPerSecondTick() {
for(final MetricSensor iSensor : sensors) {
- String valueAsString = iSensor.getValueAsString();
+ String valueAsString = iSensor.getValueAsString(true);
if (valueAsString != null) {
send(valueAsString, iSensor.getName());
diff --git a/src/main/java/org/opennars/lab/metric/MetricSensor.java b/src/main/java/org/opennars/lab/metric/MetricSensor.java
index 2daf7d339..12a7f5caa 100644
--- a/src/main/java/org/opennars/lab/metric/MetricSensor.java
+++ b/src/main/java/org/opennars/lab/metric/MetricSensor.java
@@ -3,7 +3,7 @@ package org.opennars.lab.metric;
public interface MetricSensor {
String getName();
- String getValueAsString();
+ String getValueAsString(boolean force);
/**
* is called to give the sensor a chance to reset the stat after sending
diff --git a/src/main/java/org/opennars/lab/microworld/Pong.java b/src/main/java/org/opennars/lab/microworld/Pong.java
index 0de3ba983..a58a064c0 100755
--- a/src/main/java/org/opennars/lab/microworld/Pong.java
+++ b/src/main/java/org/opennars/lab/microworld/Pong.java
@@ -71,7 +71,7 @@ public class Pong extends Frame {
}
@Override
- public String getValueAsString() {
+ public String getValueAsString(boolean force) {
if (oldBallHits == ballHits) {
return null; // don't send anything
}
@@ -94,7 +94,7 @@ public class Pong extends Frame {
}
@Override
- public String getValueAsString() {
+ public String getValueAsString(boolean force) {
if (oldBallMisses == ballMisses) {
return null; // don't send anything
}
@@ -118,8 +118,8 @@ public class Pong extends Frame {
}
@Override
- public String getValueAsString() {
- if (oldBallHits == ballHits) {
+ public String getValueAsString(boolean force) {
+ if (!force && oldBallHits == ballHits) {
return null; // don't send anything
}
@@ -141,8 +141,8 @@ public class Pong extends Frame {
}
@Override
- public String getValueAsString() {
- if (oldBallMisses == ballMisses) {
+ public String getValueAsString(boolean force) {
+ if (!force && oldBallMisses == ballMisses) {
return null; // don't send anything
}
diff --git a/src/main/java/org/opennars/lab/microworld/SimNAR.java b/src/main/java/org/opennars/lab/microworld/SimNAR.java
index b5fed0088..eb0108db6 100755
--- a/src/main/java/org/opennars/lab/microworld/SimNAR.java
+++ b/src/main/java/org/opennars/lab/microworld/SimNAR.java
@@ -57,7 +57,7 @@ public class SimNAR extends Frame {
}
@Override
- public String getValueAsString() {
+ public String getValueAsString(boolean force) {
return "" + counterAteGood;
}
@@ -73,7 +73,7 @@ public class SimNAR extends Frame {
}
@Override
- public String getValueAsString() {
+ public String getValueAsString(boolean force) {
return "" + counterAteBad;
}
--
GitLab