more more more

Philip Guo · Philip Guo · commit 53cf9450093d · 2011-10-01T23:48:32.000-04:00
diff --git a/cgi-bin/pg_logger.py b/cgi-bin/pg_logger.py
@@ -28,8 +28,11 @@
 
 # upper-bound on the number of executed lines, in order to guard against
 # infinite loops
-MAX_EXECUTED_LINES = 300
+MAX_EXECUTED_LINES = 200
 
+def set_max_executed_lines(m):
+  global MAX_EXECUTED_LINES
+  MAX_EXECUTED_LINES = m
 
 import sys
 import bdb # the KEY import here!
diff --git a/cgi-bin/web_exec.py b/cgi-bin/web_exec.py
@@ -90,6 +90,7 @@ def web_finalizer(output_lst):
 
 form = cgi.FieldStorage()
 user_script = form['user_script'].value
+if 'max_instructions' in form:
+  pg_logger.set_max_executed_lines(int(form['max_instructions'].value))
 
 pg_logger.exec_script_str(user_script, web_finalizer)
-
diff --git a/cgi-bin/web_run_test.py b/cgi-bin/web_run_test.py
@@ -128,12 +128,16 @@ def really_finalize():
 user_script = form['user_script'].value
 expect_script = form['expect_script'].value
 
-
 # WEIRD: always run the expect_script FIRST since it's less likely to have
 # errors.  for some mysterious reason, if there's an error in user_script,
 # then it will never run expect_script
 #
 # also make sure to ignore IDs so that we can do direct object comparisons!
 pg_logger.exec_script_str(expect_script, expect_script_finalizer, ignore_id=True)
-pg_logger.exec_script_str(user_script, user_script_finalizer, ignore_id=True)
 
+
+# set a custom instruction limit only for user scripts ...
+if 'max_instructions' in form:
+  pg_logger.set_max_executed_lines(int(form['max_instructions'].value))
+
+pg_logger.exec_script_str(user_script, user_script_finalizer, ignore_id=True)
diff --git a/edu-python-questions.js b/edu-python-questions.js
@@ -275,8 +275,13 @@ function finishQuestionsInit(questionsDat) {
 
     var submittedCode = concatSolnTestCode($("#actualCodeInput").val(), $("#testCodeInput").val());
 
+    var postParams = {user_script : submittedCode};
+    if (questionsDat.max_instructions) {
+      postParams.max_instructions = questionsDat.max_instructions;
+    }
+
     $.post("cgi-bin/web_exec.py",
-           {user_script : submittedCode},
+           postParams,
            function(traceData) {
              renderPyCodeOutput(submittedCode);
              enterVisualizeMode(traceData);
@@ -300,8 +305,14 @@ function finishQuestionsInit(questionsDat) {
     // out-of-order, so code very carefully here!!!
     for (var i = 0; i < tests.length; i++) {
       var submittedCode = concatSolnTestCode($("#actualCodeInput").val(), tests[i]);
+
+      var postParams = {user_script : submittedCode, expect_script : expects[i]};
+      if (questionsDat.max_instructions) {
+        postParams.max_instructions = questionsDat.max_instructions;
+      }
+
       $.post("cgi-bin/web_run_test.py",
-             {user_script : submittedCode, expect_script : expects[i]},
+             postParams,
              genTestResultHandler(i),
              "json");
     }
@@ -342,7 +353,7 @@ function gradeSubmission() {
     }
 
     if (res.status == 'error') {
-      $("#gradeMatrix tr.gradeMatrixRow:last").append('<td class="testOutputCell"><span style="padding: 5px; background-color: ' + errorColor + ';">' + res.error_msg + '</span></td>');
+      $("#gradeMatrix tr.gradeMatrixRow:last").append('<td class="testOutputCell"><span style="padding-left: 3px; padding-right: 3px; background-color: ' + errorColor + '">' + res.error_msg + '</span></td>');
     }
     else {
       assert(res.status == 'ok');
diff --git a/edu-python.css b/edu-python.css
@@ -190,11 +190,6 @@ div#editCodeLinkDiv {
   margin-bottom: 4px;
 }
 
-#warningOutput {
-  font-size: 9pt;
-  color: #666666;
-}
-
 button.bigBtn {
   font-size: 14pt;
   padding: 3px;
diff --git a/edu-python.js b/edu-python.js
@@ -83,7 +83,6 @@ function processTrace(traceData, jumpToEnd) {
   curInstr = 0;
 
   // delete all stale output
-  $("#warningOutput").html('');
   $("#pyStdout").val('');
 
   if (curTrace.length > 0) {
@@ -95,7 +94,8 @@ function processTrace(traceData, jumpToEnd) {
     if (instrLimitReached) {
       curTrace.pop() // kill last entry
       var warningMsg = lastEntry.exception_msg;
-      $("#warningOutput").html(htmlspecialchars(warningMsg));
+      $("#errorOutput").html(htmlspecialchars(warningMsg));
+      $("#errorOutput").show();
     }
     // as imran suggests, for a (non-error) one-liner, SNIP off the
     // first instruction so that we start after the FIRST instruction
@@ -218,7 +218,9 @@ function updateOutput() {
     hasError = true;
   }
   else {
-    $("#errorOutput").hide();
+    if (!instrLimitReached) { // ugly, I know :/
+      $("#errorOutput").hide();
+    }
   }
 
 
diff --git a/index.html b/index.html
@@ -134,8 +134,6 @@
   <span id="curInstr">Step ? of ?</span>
   <button id="jmpStepFwd", type="button">Forward &gt;</button>
   <button id="jmpLastInstr", type="button">Last &gt;&gt;</button>
-
-  <p><span id="warningOutput"></span></p>
 </div>
 
 <div id="errorOutput"></div>
diff --git a/question.html b/question.html
@@ -116,8 +116,6 @@
   <span id="curInstr">Step ? of ?</span>
   <button id="jmpStepFwd", type="button">Forward &gt;</button>
   <button id="jmpLastInstr", type="button">Last &gt;&gt;</button>
-
-  <p><span id="warningOutput"></span></p>
 </div>
 
 <div id="errorOutput"></div>
diff --git a/questions/optimize-search.txt b/questions/optimize-search.txt
@@ -5,8 +5,8 @@ Question:
 
 The following search function finds the index of the first occurrence of
 elt in a sorted list lst (or -1 if elt not found).  Optimize this
-function so that it works on a 64-element sorted list using less than 50
-instructions.
+function so that it works on a 64-element sorted list by executing less
+than 50 instructions.
 
 Hint:
 Linear search will never work.
