experimental: replace old statistics collection with new approach

code compiles but parallel oracle tests still fail because the implementation is not thread-safe. final solution is still open for discussion.

Author: mtf90

algorithms/active/adt/src/test/java/de/learnlib/algorithm/adt/it/ADTIT.java

@@ -42,6 +42,7 @@
 import de.learnlib.oracle.equivalence.MealySimulatorEQOracle;
 import de.learnlib.oracle.membership.MealySimulatorOracle;
 import de.learnlib.oracle.membership.SULAdaptiveOracle;
+import de.learnlib.statistic.Statistics;
 import de.learnlib.sul.SUL;
 import de.learnlib.testsupport.MQ2AQWrapper;
 import de.learnlib.testsupport.it.learner.AbstractMealyLearnerIT;
@@ -130,6 +131,7 @@ public void testIssue137() throws IOException, FormatException {
                     for (int seed = 0; seed < 50; seed++) {
                         long last = 0;
                         for (int iter = 0; iter < 5; iter++) {
+                            Statistics.getContainer().clear();
                             final CounterAdaptiveQueryOracle<String, String> counter =
                                     new CounterAdaptiveQueryOracle<>(aqo);
                             final ADTLearner<String, String> learner = new ADTLearner<>(alphabet,
@@ -151,7 +153,8 @@ public void testIssue137() throws IOException, FormatException {
 
                             exp.run();
 
-                            final long count = counter.getResetCounter().getCount();
+                            final long count =
+                                    Statistics.getContainer().getCount(CounterAdaptiveQueryOracle.RESET_KEY).orElse(0L);
 
                             if (iter == 0) {
                                 last = count;

api/src/main/java/de/learnlib/statistic/DummyStatsContainer.java

@@ -9,58 +9,50 @@
  * A dummy implementation of {@link StatsContainer} that does nothing.
  */
 class DummyStatsContainer implements StatsContainer {
-    @Override
-    public void addTextInfo(String id, @Nullable String description, String text) {
 
-    }
+    @Override
+    public void addTextInfo(String id, @Nullable String description, String text) {}
 
     @Override
     public Optional<String> getTextValue(String id) {
         return Optional.empty();
     }
 
     @Override
-    public void setFlag(String id, @Nullable String description, boolean value) {
-
-    }
+    public void setFlag(String id, @Nullable String description, boolean value) {}
 
     @Override
     public Optional<Boolean> getFlagValue(String id) {
         return Optional.empty();
     }
 
     @Override
-    public void startOrResumeClock(String id, @Nullable String description) {
-
-    }
+    public void startOrResumeClock(String id, @Nullable String description) {}
 
     @Override
-    public void pauseClock(String id) {
-
-    }
+    public void pauseClock(String id) {}
 
     @Override
     public Optional<Duration> getClockValue(String id) {
         return Optional.empty();
     }
 
     @Override
-    public void increaseCounter(String id, @Nullable String description, long increment) {
-
-    }
+    public void increaseCounter(String id, @Nullable String description, long increment) {}
 
     @Override
-    public void setCounter(String id, @Nullable String description, long count) {
-
-    }
+    public void setCounter(String id, @Nullable String description, long count) {}
 
     @Override
     public Optional<Long> getCount(String id) {
         return Optional.empty();
     }
 
     @Override
-    public void printStats() {
-        System.out.println("Dummy container");
+    public void clear() {}
+
+    @Override
+    public String printStats() {
+        return "Dummy container";
     }
 }

api/src/main/java/de/learnlib/statistic/StatisticCollector.java

@@ -122,8 +122,10 @@ default void increaseCounter(String id, @Nullable String description) {
      */
     Optional<Long> getCount(String id);
 
+
+    void clear();
     /**
      * Prints all stored statistics.
      */
-    void printStats();
+    String printStats();
 }

api/src/main/java/de/learnlib/statistic/StatisticData.java

@@ -48,6 +48,10 @@
             <groupId>de.learnlib</groupId>
             <artifactId>learnlib-lstar</artifactId>
         </dependency>
+        <dependency>
+            <groupId>de.learnlib</groupId>
+            <artifactId>learnlib-statistics</artifactId>
+        </dependency>
         <dependency>
             <groupId>de.learnlib</groupId>
             <artifactId>learnlib-util</artifactId>

api/src/main/java/de/learnlib/statistic/StatisticLearner.java

@@ -9,8 +9,8 @@
 import de.learnlib.oracle.MembershipOracle.DFAMembershipOracle;
 import de.learnlib.oracle.equivalence.DFAWMethodEQOracle;
 import de.learnlib.oracle.membership.DFASimulatorOracle;
+import de.learnlib.statistic.Statistics;
 import de.learnlib.util.Experiment.DFAExperiment;
-import de.learnlib.util.statistic.SimpleProfiler;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.alphabet.impl.Alphabets;
 import net.automatalib.automaton.fsa.DFA;
@@ -60,12 +60,6 @@ public static void main(String[] args) throws IOException {
         // active learning
         DFAExperiment<Character> experiment = new DFAExperiment<>(lstar, wMethod, inputs);
 
-        // turn on time profiling
-        experiment.setProfile(true);
-
-        // enable logging of models
-        experiment.setLogModels(true);
-
         // run experiment
         experiment.run();
 
@@ -75,12 +69,8 @@ public static void main(String[] args) throws IOException {
         // report results
         System.out.println("-------------------------------------------------------");
 
-        // profiling
-        SimpleProfiler.logResults();
-
         // learning statistics
-        System.out.println(experiment.getRounds().getSummary());
-        System.out.println(mqOracle.getStatisticalData().getSummary());
+        System.out.println(Statistics.getContainer().printStats());
 
         // model statistics
         System.out.println("States: " + result.size());