comparison TestController.h @ 2:851833072cf1

panel has 8 sliders if needed.
sliders should get set by midi input.

     }
     controlPanelType getControlPanelType() const{
         return panelType;
     };
     string getTestTypeAdvanceWarning(){
+        
         stringstream msg;
         
         msg << "Next test: " << endl << endl;
         if (panelType == REVISITABLE){
             msg << "Sliders " << " x " << numDimensions << endl;

         if (panelType == SIMULTANEOUS && numDimensions == 2){
             msg << "XY pad " << endl;
         }
         if (panelType == SIMULTANEOUS && numDimensions == 3){
             msg << "LEAP MOTION 3D -> -> -> -> ->" << endl;
+        }
+        if (panelType == REVISITABLE && numDimensions > 3){
+            msg << numDimensions << " DOF. The new frontier." << endl;
         }
         if (isMemoryTest()){
             msg << endl << "MEMORY TEST - ONE TARGET LISTEN ONLY!!" << endl;
         }
         if (!scored){

     static const int numDifferentTests;
     static const int totalNumTests;
     vector<Test>::iterator currentTest;
     TestController(){
         
-       generateSomeTests(1, 3, SIMULTANEOUS,1, false, true, true);
-        
-        generateSomeTests(4, 2, SIMULTANEOUS, 1, true);
-        
-        // 3 demo runs
-        generateSomeTests(1, 1, REVISITABLE, 1, false, false, false);
-        generateSomeTests(1, 2, SIMULTANEOUS, 1, false, false, true);
-        generateSomeTests(1, 3, SIMULTANEOUS,1, false, true, false);
-        // 3 practice runs
-
-        //----------------------
-        // 1D set 1
-        // 7 to 12
-        generateSomeTests(2, 1, REVISITABLE, 1, true);
-        generateSomeTests(2, 1, REVISITABLE, 2, true);
-        generateSomeTests(2, 1, REVISITABLE, 4, true);
-
-        
-        // 2D tests 1
-        // 13 to 28
-        generateSomeTests(4, 2, REVISITABLE, 1, true);
-        generateSomeTests(4, 2, SIMULTANEOUS, 1, true);
-        generateSomeTests(4, 2, SIMULTANEOUS, 2, true);
-        generateSomeTests(4, 2, REVISITABLE, 2, true);
-        
-        // 3D Tests 1
-        // 29 to 44
-        generateSomeTests(8,3,SIMULTANEOUS,1, true);
-        generateSomeTests(8,3,REVISITABLE,1, true);
-        
-        //----------------------
-        
-        // 1D set 2 (WITH HINTS)
-        // 45 to 47
-        generateSomeTests(1, 1, REVISITABLE, 1, true, true);
-        generateSomeTests(1, 1, REVISITABLE, 2, true, true);
-        generateSomeTests(1, 1, REVISITABLE, 4, true, true);
-        
-        // 2D set 2 (WITH HINTS)
-        // 48 to 51
-        generateSomeTests(2, 2, SIMULTANEOUS, 1, true, true);
-        generateSomeTests(2, 2, REVISITABLE, 1, true, true);
-        
-        // 3D set 2 (WITH HINTS)
-        // 52 to 59
-        generateSomeTests(4,3,REVISITABLE ,1, true, true);
-        generateSomeTests(4,3,SIMULTANEOUS,1, true, true);
-        
-        //----------------------
-        
-        // NOW MEMORY TESTS!
-        // 1D memory test
-        generateSomeTests(2, 1, REVISITABLE, 1, true,false, true);
-        generateSomeTests(2, 1, REVISITABLE, 2, true,false, true);
-        generateSomeTests(2, 1, REVISITABLE, 4, true,false, true);
-        
-        // 2D set 3
-        generateSomeTests(4, 2, SIMULTANEOUS, 1, true,false, true);
-        generateSomeTests(4, 2, REVISITABLE, 1, true,false, true);
-        generateSomeTests(4, 2, REVISITABLE, 2, true,false, true);
-        generateSomeTests(4, 2, SIMULTANEOUS, 2, true,false, true);
-        
-       
-        // 3D set 3
-        // MEMORY
-        generateSomeTests(8,3,REVISITABLE ,1, true,false, true);
-        generateSomeTests(8,3,SIMULTANEOUS,1, true,false, true);
-        // 72
-        //----------------------
-
-        
-        
-        //generate1DSpecificTests();
-        
-        //generate2DSpecificTests();
-        //generate3DSpecificTests();
-        //generate2DRandomTests();
-        //generate4DTests();
+//        int howManyTests,
+//        int numDimensions,
+//        controlPanelType panelType,
+//        int whichSpace,
+//        bool scored,
+//        bool aHint,
+//        bool aMemoryTest){
+        
+       generateSomeTests(8, 8, REVISITABLE,1, false, false, false);
+
         currentTest = testList.begin()-1; // dont do this
         scoreRunningTotal = 0;
     };