Fixed merge conflict: I kept the renumbering in. I think it should be…

… properly fixed by my suggestion in tudelft-cda-lab#23.

source/apta.cpp

@@ -13,6 +13,7 @@
 #include "utility/loguru.hpp"
 #include "input/abbadingoreader.h"
 #include "input/inputdatalocator.h"
+#include "input/parsers/abbadingoparser.h"
 
 using namespace std;
 
@@ -40,11 +41,9 @@ apta::apta(){
 }
 
 void apta::print_dot(iostream& output){
-    int ncounter = 0;
     // needed for the correct printing of intermediate models after undoing merges
-    for(APTA_iterator Ait = APTA_iterator(root); *Ait != 0; ++Ait){
-        (*Ait)->number = ncounter++;
-    }
+    // Hielke: Fix numbering of states properly with suggestion in #23.
+    merger->renumber_states();
 
     output << "digraph DFA {\n";
     output << "\t" << root->find()->number << " [label=\"root\" shape=box];\n";
@@ -70,23 +69,19 @@ void apta::print_dot(iostream& output){
 
         output << "\t" << n->number << " [ label=\"";
         if(DEBUGGING){
-            output << n << ":#" << "\n";
-            output << "rep#" << n->representative << "\n";
+            output << n << ":#" << "\\n";
+            output << "rep#" << n->representative << "\\n";
         }
-
-        output << n->number << ":#" << n->size << "\n";
+        output << n->number << " #" << n->size << " ";
         n->data->print_state_label(output);
-        output << "\" ";
         n->data->print_state_style(output);
-        if (!n->red) output << " style=dotted";
-
-        //output << n->number << " #" << n->size << "\" ";
-        //if (n->is_red()) output << ", style=filled, fillcolor=\"firebrick1\"";
-        //else if (n->is_blue()) output << ", style=filled, fillcolor=\"dodgerblue1\"";
-        //else if (n->is_white()) output << ", style=filled, fillcolor=\"ghostwhite\"";
-        //output << ", width=" << log(1 + log(1 + n->size));
-        //output << ", height=" << log(1 + log(1 + n->size));
+        output << "\" ";
 
+        if (n->is_red()) output << ", style=filled, fillcolor=\"firebrick1\"";
+        else if (n->is_blue()) output << ", style=filled, fillcolor=\"dodgerblue1\"";
+        else if (n->is_white()) output << ", style=filled, fillcolor=\"ghostwhite\"";
+        output << ", width=" << log(1 + log(1 + n->size));
+        output << ", height=" << log(1 + log(1 + n->size));
         output << ", penwidth=" << log(1 + n->size);
         output << "];\n";
 
@@ -108,18 +103,14 @@ void apta::print_dot(iostream& output){
 
             output << "\t\t" << n->number << " -> " << child->number << " [label=\"";
 
-            output << inputdata_locator::get()->get_symbol(it->first) << endl;
-
-            //n->data->print_transition_label(output, it->first);
-
-
+            output << inputdata_locator::get()->get_symbol(it->first) << " ";
+            n->data->print_transition_label(output, it->first);
             for(auto & min_attribute_value : g->min_attribute_values){
-                output << " " << inputdata_locator::get()->get_attribute(min_attribute_value.first) << " >= " << min_attribute_value.second;
+                output << "\\n" << inputdata_locator::get()->get_attribute(min_attribute_value.first) << " >= " << min_attribute_value.second;
             }
             for(auto & max_attribute_value : g->max_attribute_values){
-                output << " " << inputdata_locator::get()->get_attribute(max_attribute_value.first) << " < " << max_attribute_value.second;
+                output << "\\n" << inputdata_locator::get()->get_attribute(max_attribute_value.first) << " < " << max_attribute_value.second;
             }
-
             output << "\" ";
             output << ", penwidth=" << log(1 + n->size);
             output << " ];\n";
@@ -176,12 +167,10 @@ void apta_node::print_json_transitions(iostream& output){
 
 void apta::print_json(iostream& output){
     set_json_depths();
-    int count = 0;
     root->depth = 0;
-    for(merged_APTA_iterator Ait = merged_APTA_iterator(root); *Ait != nullptr; ++Ait){
-        apta_node* n = *Ait;
-        n->number = count++;
-    }
+    // needed for the correct printing of intermediate models after undoing merges
+    // Hielke: Fix numbering of states properly with suggestion in #23.
+    merger->renumber_states();
 
     output << "{\n";
     output << "\t\"types\" : [\n";
@@ -330,8 +319,13 @@ void apta::read_json(istream& input_stream){
         string trace = n["trace"];
         istringstream trace_stream(trace);
         node->access_trace = mem_store::create_trace();
-        // TODO: verify this with Sicco (robert)
-        // idat.read_abbadingo_sequence(trace_stream,node->access_trace);
+
+        auto parser = abbadingoparser::single_trace(trace_stream);
+        auto strategy = read_all();
+        auto trace_maybe = inputdata_locator::get()->read_trace(parser, strategy);
+        if (trace_maybe.has_value()) {
+            node->access_trace = trace_maybe.value();
+        }
     }
     for (int i = 1; i < read_apta["nodes"].size(); ++i) {
         json n = read_apta["nodes"][i];
@@ -447,7 +441,8 @@ void apta_node::initialize(apta_node* n){
     representative_of = nullptr;
     tails_head = nullptr;
     access_trace = nullptr;
-    number = -1;
+    // keep the old node number
+    // number = -1;
     size = 0;
     final = 0;
     depth = 0;
@@ -821,4 +816,4 @@ void apta::set_json_depths() const {
             it++;
         }
     }
-}
+}

source/evaluation/mealy.cpp

@@ -99,7 +99,7 @@ void mealy::reset(state_merger* merger){
 
 
 void mealy_data::print_transition_label(iostream& output, int symbol){
-   output << int_output[outputs[symbol]];
+   output << "/" << int_output[outputs[symbol]];
 };
 
 string mealy_data::predict_data(tail* t){

source/input/parsers/abbadingoparser.cpp

@@ -18,7 +18,7 @@
 #include <sstream>
 #include <chrono>
 
-void abbadingoparser::parse_header() {
+void abbadingoparser::parse_header(std::istream &inputstream) {
     std::string line;
     std::getline(inputstream, line);
 
@@ -166,3 +166,21 @@ std::optional<symbol_info> abbadingoparser::next() {
     symbols.pop_front();
     return cur_symbol;
 }
+
+/**
+ * Helper method to read a single abbadingo formatted trace
+ * Currently does not support trace or symbol attributes
+ *
+ * @param trace an input stream containing an abbadingo formatted trace.
+ * @return a parser for the trace.
+ */
+abbadingoparser abbadingoparser::single_trace(std::istream &trace) {
+
+    abbadingoparser parser(trace, false);
+
+    std::stringstream header;
+    header << "1 0\n";
+    parser.parse_header(header);
+
+    return parser;
+}

source/input/parsers/abbadingoparser.h

@@ -22,18 +22,24 @@ class abbadingoparser: public parser {
     std::vector<attribute_info> trace_attr_prototypes;
     std::vector<attribute_info> symbol_attr_prototypes;
 
+
+
 public:
-    abbadingoparser(std::istream &input)
+    explicit abbadingoparser(std::istream &input, bool header = true)
     : inputstream(input)
     {
-        parse_header();
+        if (header) {
+            parse_header(inputstream);
+        }
     }
 
-    void parse_header();
+    void parse_header(std::istream &inputstream);
 
     bool read_abbadingo_trace();
 
     std::optional<symbol_info> next();
+
+    static abbadingoparser single_trace(std::istream &input);
 };
 
 

source/input/parsers/grammar/abbadingoheader.h

@@ -137,7 +137,7 @@ namespace {
 
         // The complete abbadingo header: number:dsft/name1,... number:dsft/name2,...
         struct abbadingo_header_p {
-            static constexpr auto rule = dsl::twice(dsl::p<abbadingo_header_part_p>, dsl::trailing_sep(dsl::ascii::space));
+            static constexpr auto rule = dsl::twice(dsl::p<abbadingo_header_part_p>, dsl::trailing_sep(dsl::ascii::space)) + (dsl::newline | dsl::eof);
             static constexpr auto value = lexy::construct<abbadingo_header_info>;
         };
     }

source/state_merger.cpp

@@ -1081,6 +1081,12 @@ void state_merger::print_dot(const string& file_name)
     output1.close();
 }
 
+void state_merger::print_dot(ostream& output)
+{
+    todot();
+    output << dot_output;
+}
+
 void state_merger::print_json(const string& file_name)
 {
     tojson();

source/state_merger.h

@@ -127,6 +127,7 @@ class state_merger{
     bool split_init(apta_node *red, tail *t, int attr, int depth, bool evaluate, bool perform, bool test);
 
     void print_dot(const string& file_name);
+    void print_dot(ostream& output);
 
     void print_json(const string& file_name);