From 7f9c3ec65571ed8c837caf5256cca4bd8275fdad Mon Sep 17 00:00:00 2001 From: MPIBR-kretschmerf Date: Tue, 18 Oct 2016 10:41:35 +0200 Subject: [PATCH] Changed order to negative first --- trialseq.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/trialseq.cpp b/trialseq.cpp index cca40f5..6920294 100644 --- a/trialseq.cpp +++ b/trialseq.cpp @@ -10,6 +10,7 @@ double randomMinMax (double min, double max) { return dist(rng); } +/*Generate the sequence (Negative always first*/ QVector generateTrialSequence(int sorting, int repeatPositive, int repeatNegative) { QVector trialSequence; @@ -20,44 +21,46 @@ QVector generateTrialSequence(int sorting, int repeatPositive, int repeatNe case TrialSeq::ORDERED: currentRepeatPositive = 1; currentRepeatNegative = 1; - while(currentRepeatPositive <= repeatPositive || currentRepeatNegative <= repeatNegative) { - if(currentRepeatPositive <= repeatPositive) { - trialSequence.append(1); - currentRepeatPositive++; - } + while(currentRepeatNegative <= repeatNegative || currentRepeatPositive <= repeatPositive) { if(currentRepeatNegative <= repeatNegative) { trialSequence.append(0); currentRepeatNegative++; } + if(currentRepeatPositive <= repeatPositive) { + trialSequence.append(1); + currentRepeatPositive++; + } } break; case TrialSeq::SORTED: - for (currentRepeatPositive = 1; currentRepeatPositive <= repeatPositive; ++currentRepeatPositive) { - trialSequence.append(1); - } for (currentRepeatNegative = 1; currentRepeatNegative <= repeatNegative; ++currentRepeatNegative) { trialSequence.append(0); } - break; - case TrialSeq::SHUFFLED: for (currentRepeatPositive = 1; currentRepeatPositive <= repeatPositive; ++currentRepeatPositive) { trialSequence.append(1); } + + break; + case TrialSeq::SHUFFLED: for (currentRepeatNegative = 1; currentRepeatNegative <= repeatNegative; ++currentRepeatNegative) { trialSequence.append(0); } + for (currentRepeatPositive = 1; currentRepeatPositive <= repeatPositive; ++currentRepeatPositive) { + trialSequence.append(1); + } + // shuffle trial sequence std::random_shuffle(trialSequence.begin(), trialSequence.end(), TrialSeq::randomGenerator); break; default: - for (currentRepeatPositive = 1; currentRepeatPositive <= repeatPositive; ++currentRepeatPositive) { - trialSequence.append(1); - for (currentRepeatNegative = 1; currentRepeatNegative <= repeatNegative; ++currentRepeatNegative) { - trialSequence.append(0); + for (currentRepeatNegative = 1; currentRepeatNegative <= repeatNegative; ++currentRepeatNegative) { + trialSequence.append(0); + for (currentRepeatPositive = 1; currentRepeatPositive <= repeatPositive; ++currentRepeatPositive) { + trialSequence.append(1); } } } - //qDebug() << trialSequence; + qDebug() << "TrialSequence: " << trialSequence; return trialSequence; } @@ -97,7 +100,6 @@ QVector loadExternalItiSequence(QString fileName, int repeatPositive, in while (!in.atEnd()) { QString line = in.readLine(); itiSequence.append(10); /*Get proper value*/ - qDebug() << line; } } return itiSequence;