random tune

src/api/generateRandom.js

@@ -99,7 +99,7 @@ module.exports = {
       let used = {}, generated = 0;
       let last = {c:-1},
         list = [],
-        globalMaxTries = args.count*5,
+        globalMaxTries = args.count*500,
         globalTries = 0;
       if(args.count>100)args.count = 100;
       while(generated<args.count && globalTries < globalMaxTries){
@@ -109,18 +109,19 @@ module.exports = {
           p: seeded() > 0.7,
           c: 1
         };
-        if( last.c === 1 && seeded() > 0.5 ){
+        if( seeded() > 0.3 ){
+        //if( last.c === 1 && seeded() > 0.5 ){
           cur = {
             c: 2
           };
           let id, tries = 0;
-          do{
+          /*do{
             id = rand(1, countStdQ);
             tries++;
             if(tries === 100){
               break;
             }
-          }while('2.'+id in used);
+          }while('2.'+id in used);*/
           if(tries===100)
             continue;
           cur.id = id;
@@ -132,8 +133,16 @@ module.exports = {
           if(cur.c === 1){
             result = ctx.quizGenerator( cur.m ? 'checkbox' : 'radio', cur.p );
           }else{
-
-            result = ctx.standardGenerator(()=>cur.id)
+            let counter = 0, r = 2;
+            do{
+              r = rand( 1, countStdQ );
+              let q = data.standardQuestions[ r ];
+              if(q && !(q.category_id+'.'+q.qID in used))
+                break;
+              counter++;
+            }while(counter < 100);
+            result = ctx.standardGenerator(()=>r);
+            if(result)
             if(!result){
               tries = 100;
               break;
@@ -143,8 +152,9 @@ module.exports = {
           if(tries === 100)
             break;
 
-        }while(result.categoryId+'.'+result.productId in used);
+        }while(result.categoryId === last.c || result.categoryId+'.'+result.productId in used);
         if(tries !== 100){
+          cur.c = result.categoryId;
 
           used[result.categoryId+'.'+result.productId] = true;
           list.push(result);