diff --git a/tests/generator/Generator.cpp b/tests/generator/Generator.cpp index 39587927c9edabedda90f6e326ecc4e487d2554f..f517437c4fbb5112c1fcf4a8347fdcf113f482c9 100644 --- a/tests/generator/Generator.cpp +++ b/tests/generator/Generator.cpp @@ -14,31 +14,32 @@ #include <iostream> #include <math.h> -Generator::Generator (QString name, - int depth, int procNbr, int nbrOfState, int nbrOfLine, - int countNbr, int eventNbr, int linkNbr, - int eventTypeNbr, int linkTypeNbr, - bool paje, bool otf, bool tau) -{ +Generator::Generator(QString name, + int depth, int procNbr, int nbrOfState, int nbrOfLine, + int countNbr, int eventNbr, int linkNbr, + int eventTypeNbr, int linkTypeNbr, + bool paje, bool otf, bool tau) : + _name(name), + _depth(depth), + _procNbr(procNbr), + _numberOfState(nbrOfState), + _numberOfLine(nbrOfLine), + + _counter(false), + _event(false), + _link(false), + + _linkNbr(linkNbr), + _linkTypeNbr(linkTypeNbr), + _eventNbr(eventNbr), + _eventTypeNbr(eventTypeNbr), + _counterNbr(countNbr) { + _dest = nullptr; + _paje = paje; _otf = otf; _tau = tau; - _name = name; - _depth = depth; - _procNbr = procNbr; - _numberOfState = nbrOfState; - _numberOfLine = nbrOfLine; - - _counter = false; - _event = false; - _link = false; - - _linkNbr = linkNbr; - _linkTypeNbr = linkTypeNbr; - _eventNbr = eventNbr; - _eventTypeNbr = eventTypeNbr; - _counterNbr = countNbr; _size = 0; @@ -71,8 +72,7 @@ Generator::Generator (QString name, if (otf) _otfGen = new OTFGenerator (); if (tau) - _tauGen = new TauGenerator (); - + _tauGen = new TauGenerator(); } Generator::~Generator (){ diff --git a/tests/generator/OTFGenerator.cpp b/tests/generator/OTFGenerator.cpp index 708fac12e383e6781c3daaf560ca05420f46ec0e..dc590a07caafab8ca3fd64a788a08b5e14e21647 100644 --- a/tests/generator/OTFGenerator.cpp +++ b/tests/generator/OTFGenerator.cpp @@ -13,6 +13,7 @@ #include "OTFGenerator.hpp" OTFGenerator::OTFGenerator (){ + _dest = nullptr; } OTFGenerator::~OTFGenerator (){ diff --git a/tests/generator/TauGenerator.cpp b/tests/generator/TauGenerator.cpp index e6438413e5af95285e091566a566fa227790ef12..f513cc88050cb2742cd154e173137198f55fb770 100644 --- a/tests/generator/TauGenerator.cpp +++ b/tests/generator/TauGenerator.cpp @@ -14,6 +14,7 @@ TauGenerator::TauGenerator (){ + _dest = nullptr; } TauGenerator::~TauGenerator (){