diff -r 6da4516ea87d -r 660cf698eb26 RegexExplosionPlot/injToSimp.sc --- a/RegexExplosionPlot/injToSimp.sc Mon Jul 24 11:09:48 2023 +0100 +++ b/RegexExplosionPlot/injToSimp.sc Tue Jul 25 17:28:29 2023 +0100 @@ -393,14 +393,14 @@ def simp_lexer(r: Rexp, s: List[Char]): Val = s match{ case Nil => {//println("mkeps!"); println(r); val v = mkeps(r); - //println(v); + println(v); v} case c::cs => { val derc1 = der(c, r); val derc = light_simp(derc1); println("derivative size: "+ size(derc)); val v = simp_lexer(derc, cs); - //println("Injection!");println("r: "+r); println("c: "+c); println("v:"+v); + println("Injection!");println("r: "+r); println("c: "+c); println("v:"+v); inj(r, c, v ) } } @@ -415,7 +415,7 @@ //val derc = light_simp(derc1); println("derivative size: "+ size(derc)); val v = print_lexer(derc, cs); - //println("Injection!");println("r: "+r); println("c: "+c); println("v:"+v); + println("Injection!");println("r: "+r); println("c: "+c); println("v:"+v); inj(r, c, v ) } } val r = STAR("a"|"aa") ~ ("c") @@ -1229,9 +1229,10 @@ // println(" " + (t1 - t0)/1e9 + "") // result //} -//val astarstarB = STAR(STAR("a"))~("b") -//val data_points_x_axis = List.range(0, 60000, 3000) +val astarstarB = STAR(STAR("a"))~("b") +val data_points_x_axis = List.range(0, 60000, 3000) //for (i <- data_points_x_axis) {print(i); time { blexing(astarstarB, ("a"*i)) } } ////println(data_points_x_axis.zip( List(0,1,3,4))) //for(i <- List.range(0, 40000, 3000)) print(i + " ") +//for (i <- data_points_x_axis) {print(i); time { simp_lexer(astarstarB, ("a"*i).toList) } }