Merge branch 'master' of github.com:Submitty/Tutorial

Author: bmcutler

examples/04_python_static_analysis/config/config.json

@@ -2,7 +2,8 @@
   "resource_limits" : {
     "RLIMIT_CPU" : 60,
     "RLIMIT_NPROC" : 100,
-    "RLIMIT_AS" : "RLIM_INFINITY"
+    "RLIMIT_AS" : "RLIM_INFINITY",
+    "RLIMIT_SIGPENDING" : 100
   },
 
   "testcases" : [
@@ -13,9 +14,9 @@
       // The first is to execute the student code, the second is to count the number of calls to the
       // "print" function.
       "command" : [ "python *.py",
-	            "submitty_count_node -l python2 assign *.py",
-		    "submitty_count_node -l python2 mul *.py",
-		    "submitty_count_node -l python2 add *.py" ],
+	            "submitty_count token -l python Equal *.py",
+		    "submitty_count token -l python Asterisk *.py",
+		    "submitty_count token -l python Plus *.py" ],
       "points" : 4,
       "validation" : [
         // First, ensure that the student received the correct answer.

examples/04_python_static_analysis/submissions/buggy.py

@@ -1,4 +1,4 @@
 volume = 5 * 16.5 * 12.5
 area = 2*5*16.5 + 2*5*12.5 + 2*16.5*12.5
-print 'volume =', volume
-print 'area =', area
+print('volume =', volume)
+print('area =', area)

examples/04_python_static_analysis/submissions/buggy_2.py

@@ -1,4 +1,4 @@
 volume = 5 * 16.5 * 12.5
 area = 10*16.5 + 10*12.5 + 2*16.5*12.5
-print 'volume =', volume
-print 'area =', area
+print('volume =', volume)
+print('area =', area)

examples/04_python_static_analysis/submissions/buggy_3.py

@@ -1,4 +1,4 @@
 volume = 5 * 16.5 * 12.5
 area =  722.5
-print 'volume =', volume
-print 'area =', area
+print('volume =', volume)
+print('area =', area)

examples/04_python_static_analysis/submissions/solution.py

@@ -3,5 +3,5 @@
 height = 12.5
 volume = length * width * height
 area = 2*length*width + 2*length*height + 2*width*height
-print 'volume =', volume
-print 'area =', area  
+print('volume =', volume)
+print('area =', area)

examples/05_cpp_static_analysis/config/config.json

@@ -2,7 +2,8 @@
     "resource_limits" : {
         "RLIMIT_CPU" : 60,
         "RLIMIT_NPROC" : 100,
-        "RLIMIT_AS" : "RLIM_INFINITY"
+        "RLIMIT_AS" : "RLIM_INFINITY",
+        "RLIMIT_SIGPENDING" : 100
     },
 
     // Static analysis can also be performed upon C++ code.
@@ -12,8 +13,8 @@
         {
 
             "title" : "Check for goto and auto",
-            "command" : [ "submitty_count_token -l c goto *.cpp",
-                          "submitty_count_token -l c auto *.cpp" ],
+            "command" : [ "submitty_count token -l c Goto *.cpp",
+                          "submitty_count token -l c Auto *.cpp" ],
             "points" : 2,
             "validation" : [
                 {