meu estado atual

dlight · dlight · commit 5643d0eb867c · 2012-04-01T23:16:45.000-03:00
diff --git a/base.css b/base.css
@@ -139,7 +139,7 @@ textarea { height: 7em; }
 }
 
 .result {
-    max-width: 40%;
+    max-width: 55%;
 
     padding: 1.2em;
     margin: 0em 2em;
diff --git a/benchmark b/benchmark
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+time {
+    for i in {1..1000}; do
+	./limboole > /dev/null <<EOF
+            ( ( o & ( ! ( ( ! ( ! ( ( v <-> ( ! ( ( ( ( q | ( ( ! ( ( ( ( v <-> (
+            q & q ) ) | ( ! s ) ) | ( q <-> p ) ) <-> ( q <-> t ) ) ) | ( p | p ) ) )
+            <-> ( p & s ) ) <-> ( s | o ) ) | ( q | q ) ) ) ) <-> ( s <-> v ) ) ) ) <->
+            ( t | r ) ) ) ) <-> ( o & o ) )
+EOF
+    done
+}
diff --git a/config.js b/config.js
@@ -0,0 +1,9 @@
+var students = [
+	"Aluno 1", "Aluno 2", "Aluno 3"
+];
+
+var num_students = students.length;
+
+var def = {
+    num_exercises: 5
+};
diff --git a/generate.php b/generate.php
@@ -120,9 +120,7 @@ function gen($params) {
     return $exercises;
 }
 
-follows(array('a', 'b', 'c'), 'a');
-
-$x = superfluous('c', array('a', 'b', 'c'), '(c|b)');
+set_time_limit(0);
 
 
 $handle = fopen('php://input','r');
diff --git a/index.html b/index.html
@@ -5,6 +5,7 @@
     <title>Adicionar Exercícios</title>
     <link rel="stylesheet" type="text/css" href="base.css" />
     <script src="jquery-1.7.1.min.js"></script>
+    <script src="config.js"></script>
     <script src="query.js"></script>
   </head>
   <body>
@@ -15,7 +16,7 @@ <h1>Adicionar exercícios</h1>
           <div class="cell"><div class="name">Exercícios por aluno</div></div>
 	  <div class="cell">
 	    <div class="block">
-              <input type="text" class="num" name="num_exercises" value="5"/> (<span id="num_total">235</span> ao todo)
+              <input type="text" class="num" name="num_exercises" value="0"/> (<span id="num_total">0</span> ao todo)
 	    </div>
 	    <div class="desc">
 	      <p>Quantos exercícios cada aluno vai receber. A turma possui 47 alunos.</p>
@@ -124,6 +125,10 @@ <h1>Adicionar exercícios</h1>
 	</div>
       </div>
     </form>
-    <div id="results" class="result"></div>
+    <div id="results" class="result">
+      <div id="tabs"></div>
+      <div id="
+
+</div>
   </body>
 </html>
diff --git a/query.js b/query.js
@@ -19,28 +19,19 @@ function read_atoms(name) {
 function form_value() {
     return {
 	num_exercises: read_num('num_exercises') * 47,
-	num_students: 47,
+	num_students: num_students,
 	atoms: read_atoms('atoms'),
 	compl_min: read_num('compl_min'),
 	compl_max: read_num('compl_max'),
 	num_premises: read_num('compl_min'),
-	//message: $("input[textarea=message]"),
 	conectives: checked('conectives'),
 	restrictions: checked('restrictions')
     };
 }
 
-var test;
 
-$(document).ready(function () {
-    /* $('input,textarea').bind('focus blur', function (ev) {
-	var s = $(this);
-	var p = s.parents('.row');
-	s.toggleClass('active');
-	p.toggleClass('active');
-	p.children('.desc').toggle();
-     }); */
 
+$(document).ready(function () {
     $("a#send").hover(function (ev) {
 	$(this).toggleClass('hover');
     });
@@ -59,17 +50,22 @@ $(document).ready(function () {
 	    },
 	    success: function(data) {
 		console.log($('#results'));
-		$('#results').show().append('<pre>' + JSON.stringify(data, null, 4));
+		$('#results').show().html('<pre>' + JSON.stringify(data, null, 4));
 		console.log(data);
-
-		test = data;
 	    }
 	});
     });
 
-    $('input[name=num_exercises]').bind('blur', function (ev) {
-	var v = $(this).val() || 0;
-	$(this).val(v);
-	$('span#num_total').text($(this).val() * 47);
-    });
+
+
+    $('input[name=num_exercises]')
+	.bind('blur', function (ev) {
+	    var v = $(this).val() || 0;
+	    $(this).val(v);
+	    $('span#num_total').text($(this).val() * num_students);
+	})
+	.val(def.num_exercises)
+	.trigger('blur');
+
+
 });

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ textarea { height: 7em; }`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`.result {`
`142`		`- max-width: 40%;`
	`142`	`+ max-width: 55%;`
`143`	`143`
`144`	`144`	`padding: 1.2em;`
`145`	`145`	`margin: 0em 2em;`
Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,7 @@ function gen($params) {`
`120`	`120`	`return $exercises;`
`121`	`121`	`}`
`122`	`122`
`123`		`-follows(array('a', 'b', 'c'), 'a');`
`124`		`-`
`125`		`-$x = superfluous('c', array('a', 'b', 'c'), '(c\|b)');`
	`123`	`+set_time_limit(0);`
`126`	`124`
`127`	`125`
`128`	`126`	`$handle = fopen('php://input','r');`