Changed order to negative first

MPIBR · Oct 18, 2016 · 7f9c3ec · 7f9c3ec
1 parent 42ce83f
commit 7f9c3ec
Showing 1 changed file with 18 additions and 16 deletions.
diff --git 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<int> generateTrialSequence(int sorting, int repeatPositive, int repeatNegative)
 {
     QVector<int> trialSequence;
@@ -20,44 +21,46 @@ QVector<int> 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<double> loadExternalItiSequence(QString fileName, int repeatPositive, in
         while (!in.atEnd()) {
             QString line = in.readLine();
             itiSequence.append(10); /*Get proper value*/
-            qDebug() << line;
         }
     }
     return itiSequence;