From 66969d1745da41a0db6e290601be02e1ac244d68 Mon Sep 17 00:00:00 2001 From: dagemcn Date: Mon, 29 Jun 2026 11:25:11 -0400 Subject: [PATCH 1/6] removed submitty_count, need to fix loop depth --- examples/04_python_static_analysis/config/config.json | 9 ++++++--- examples/06_loop_types/config/config.json | 6 ++++-- examples/07_loop_depth/config/config.json | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/examples/04_python_static_analysis/config/config.json b/examples/04_python_static_analysis/config/config.json index 1b3165c..99c8730 100644 --- a/examples/04_python_static_analysis/config/config.json +++ b/examples/04_python_static_analysis/config/config.json @@ -7,9 +7,12 @@ // The first is to execute the student code, the second is to count the number of calls to the // "print" function. "command" : [ "python3 *.py", - "submitty_count token -l python Equal *.py", - "submitty_count token -l python Asterisk *.py", - "submitty_count token -l python Plus *.py" ], + // "submitty_count token -l python Equal *.py", + // "submitty_count token -l python Asterisk *.py", + // "submitty_count token -l python Plus *.py" ], + "submitty_count_ts -l python node = *.py", + "submitty_count_ts -l python node * *.py", + "submitty_count_ts -l python node + *.py" ], "points" : 4, "validation" : [ // First, ensure that the student received the correct answer. diff --git a/examples/06_loop_types/config/config.json b/examples/06_loop_types/config/config.json index 8b3bc69..ffd2bbb 100644 --- a/examples/06_loop_types/config/config.json +++ b/examples/06_loop_types/config/config.json @@ -2,8 +2,10 @@ "testcases" : [ { "title" : "Python - Distinguish for and while Loops", - "command" : [ "submitty_count -l python node for *.py", - "submitty_count -l python token While *.py" ], + // "command" : [ "submitty_count -l python node for *.py", + // "submitty_count -l python token While *.py" ], + "command" : [ "submitty_count_ts -l python node for *.py", + "submitty_count_ts -l python node While *.py" ], "points" : 2, "validation" : [ { diff --git a/examples/07_loop_depth/config/config.json b/examples/07_loop_depth/config/config.json index e57ed59..7ceed2e 100644 --- a/examples/07_loop_depth/config/config.json +++ b/examples/07_loop_depth/config/config.json @@ -6,7 +6,8 @@ // Here, an instructor-provided static analysis script is used, rather // than one of the provided scripts like count_token and count_function. // This works in much the same way as those scripts. - "command" : [ "submitty_count -l python depth loop *.py" ], + // "command" : [ "submitty_count -l python depth loop *.py" ], + "command" : [ "submitty_count_ts -l python node while *.py" ], "points" : 10, "validation" : [ { From 0f29a7abc10f0f8463dff6c3bd3a55eba2c59a03 Mon Sep 17 00:00:00 2001 From: dagemcn Date: Mon, 29 Jun 2026 15:05:18 -0400 Subject: [PATCH 2/6] 07 should always return full credit now --- examples/07_loop_depth/config/config.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/examples/07_loop_depth/config/config.json b/examples/07_loop_depth/config/config.json index 7ceed2e..6285f86 100644 --- a/examples/07_loop_depth/config/config.json +++ b/examples/07_loop_depth/config/config.json @@ -7,7 +7,10 @@ // than one of the provided scripts like count_token and count_function. // This works in much the same way as those scripts. // "command" : [ "submitty_count -l python depth loop *.py" ], - "command" : [ "submitty_count_ts -l python node while *.py" ], + // In the process of deprecating submitty_count and replacing it with submitty_count_ts, the loop depth functionality + // was lost. This example should either be updated or removed. + // "" + "command" : [ "submitty_count_ts -l python call print *.py" ], "points" : 10, "validation" : [ { @@ -15,11 +18,11 @@ "actual_file" : "STDOUT.txt", "description" : "Loop Depth", - "comparison" : "le", - "term" : 3, + "comparison" : "ge", + "term" : 0, - "failure_message" : "Must have less than four nested loops", - "show_message" : "always", + // "failure_message" : "Must have less than four nested loops", + // "show_message" : "always", "show_actual" : "always" } ] From f4742bd5d56e5f36c6020d3905e9905a8503c89e Mon Sep 17 00:00:00 2001 From: dagemcn Date: Tue, 30 Jun 2026 14:22:26 -0400 Subject: [PATCH 3/6] commected out entire testcase --- examples/07_loop_depth/config/config.json | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/examples/07_loop_depth/config/config.json b/examples/07_loop_depth/config/config.json index 6285f86..e53b919 100644 --- a/examples/07_loop_depth/config/config.json +++ b/examples/07_loop_depth/config/config.json @@ -1,31 +1,32 @@ +// FIXME: In the process of deprecating submitty_count and replacing it with submitty_count_ts, the loop depth functionality +// was lost. This example should either be updated or removed. { "testcases" : [ - { - "title" : "Python - Determine Loop Depth", + ] +// { +// "title" : "Python - Determine Loop Depth", // Here, an instructor-provided static analysis script is used, rather // than one of the provided scripts like count_token and count_function. // This works in much the same way as those scripts. // "command" : [ "submitty_count -l python depth loop *.py" ], - // In the process of deprecating submitty_count and replacing it with submitty_count_ts, the loop depth functionality - // was lost. This example should either be updated or removed. // "" - "command" : [ "submitty_count_ts -l python call print *.py" ], - "points" : 10, - "validation" : [ - { - "method" : "intComparison", - "actual_file" : "STDOUT.txt", - "description" : "Loop Depth", +// "command" : [ "submitty_count_ts -l python call print *.py" ], +// "points" : 10, +// "validation" : [ +// { +// "method" : "intComparison", +// "actual_file" : "STDOUT.txt", +// "description" : "Loop Depth", - "comparison" : "ge", - "term" : 0, +// "comparison" : "ge", +// "term" : 0, - // "failure_message" : "Must have less than four nested loops", - // "show_message" : "always", - "show_actual" : "always" - } - ] - } - ] +// // "failure_message" : "Must have less than four nested loops", +// // "show_message" : "always", +// "show_actual" : "always" +// } +// ] +// } +// ] } From 7f7fce051cea1a6b95c377b381eabd3b07003cb4 Mon Sep 17 00:00:00 2001 From: dagemcn Date: Wed, 8 Jul 2026 14:51:45 -0400 Subject: [PATCH 4/6] removed comments --- .../config/config.json | 17 +++++++++-------- examples/06_loop_types/config/config.json | 2 -- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/examples/04_python_static_analysis/config/config.json b/examples/04_python_static_analysis/config/config.json index 99c8730..74c82a8 100644 --- a/examples/04_python_static_analysis/config/config.json +++ b/examples/04_python_static_analysis/config/config.json @@ -1,4 +1,8 @@ { + "autograding_method": "docker", + "container_options": { + "container_image": "dagemcn/dockerimages:default-test" + }, "testcases" : [ { "title" : "Python - Static Analysis", @@ -7,12 +11,9 @@ // The first is to execute the student code, the second is to count the number of calls to the // "print" function. "command" : [ "python3 *.py", - // "submitty_count token -l python Equal *.py", - // "submitty_count token -l python Asterisk *.py", - // "submitty_count token -l python Plus *.py" ], - "submitty_count_ts -l python node = *.py", - "submitty_count_ts -l python node * *.py", - "submitty_count_ts -l python node + *.py" ], + "submitty_count_ts python node = *.py", + "submitty_count_ts python node * *.py", + "submitty_count_ts python node + *.py" ], "points" : 4, "validation" : [ // First, ensure that the student received the correct answer. @@ -33,7 +34,7 @@ // against the provided term (here, "greater-than-or-equal" is used). "comparison" : "ge", // The integer against which to compare. - "term" : 5, + "term" : 2, // Message to the student. "failure_message" : "Re-read the problem instructions.", @@ -47,7 +48,7 @@ "actual_file" : "STDOUT_2.txt", "description" : "Number of multiplications", "comparison" : "ge", - "term" : 7, + "term" : 2, "failure_message" : "Re-read the problem instructions.", "show_message" : "on_failure", "show_actual" : "never" diff --git a/examples/06_loop_types/config/config.json b/examples/06_loop_types/config/config.json index ffd2bbb..509d60d 100644 --- a/examples/06_loop_types/config/config.json +++ b/examples/06_loop_types/config/config.json @@ -2,8 +2,6 @@ "testcases" : [ { "title" : "Python - Distinguish for and while Loops", - // "command" : [ "submitty_count -l python node for *.py", - // "submitty_count -l python token While *.py" ], "command" : [ "submitty_count_ts -l python node for *.py", "submitty_count_ts -l python node While *.py" ], "points" : 2, From a73abd6fc673ae815380ebe96e727646ab992561 Mon Sep 17 00:00:00 2001 From: dagemcn Date: Wed, 8 Jul 2026 15:33:10 -0400 Subject: [PATCH 5/6] reverted changes made during testing --- examples/04_python_static_analysis/config/config.json | 8 ++------ examples/07_loop_depth/config/config.json | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/04_python_static_analysis/config/config.json b/examples/04_python_static_analysis/config/config.json index 74c82a8..08a1c19 100644 --- a/examples/04_python_static_analysis/config/config.json +++ b/examples/04_python_static_analysis/config/config.json @@ -1,8 +1,4 @@ { - "autograding_method": "docker", - "container_options": { - "container_image": "dagemcn/dockerimages:default-test" - }, "testcases" : [ { "title" : "Python - Static Analysis", @@ -34,7 +30,7 @@ // against the provided term (here, "greater-than-or-equal" is used). "comparison" : "ge", // The integer against which to compare. - "term" : 2, + "term" : 5, // Message to the student. "failure_message" : "Re-read the problem instructions.", @@ -48,7 +44,7 @@ "actual_file" : "STDOUT_2.txt", "description" : "Number of multiplications", "comparison" : "ge", - "term" : 2, + "term" : 7, "failure_message" : "Re-read the problem instructions.", "show_message" : "on_failure", "show_actual" : "never" diff --git a/examples/07_loop_depth/config/config.json b/examples/07_loop_depth/config/config.json index e53b919..1abc145 100644 --- a/examples/07_loop_depth/config/config.json +++ b/examples/07_loop_depth/config/config.json @@ -20,7 +20,7 @@ // "description" : "Loop Depth", // "comparison" : "ge", -// "term" : 0, +// "term" : 3 , // // "failure_message" : "Must have less than four nested loops", // // "show_message" : "always", From 6e1067b93a6ddecbb5c93dc07b644593c9acb1cf Mon Sep 17 00:00:00 2001 From: dagemcn Date: Thu, 9 Jul 2026 10:25:27 -0400 Subject: [PATCH 6/6] fixed broken configs --- examples/04_python_static_analysis/config/config.json | 6 +++--- examples/06_loop_types/config/config.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/04_python_static_analysis/config/config.json b/examples/04_python_static_analysis/config/config.json index 08a1c19..ffc5356 100644 --- a/examples/04_python_static_analysis/config/config.json +++ b/examples/04_python_static_analysis/config/config.json @@ -7,9 +7,9 @@ // The first is to execute the student code, the second is to count the number of calls to the // "print" function. "command" : [ "python3 *.py", - "submitty_count_ts python node = *.py", - "submitty_count_ts python node * *.py", - "submitty_count_ts python node + *.py" ], + "submitty_count_ts -l python node = *.py", + "submitty_count_ts -l python node \\\\* *.py", + "submitty_count_ts -l python node + *.py" ], "points" : 4, "validation" : [ // First, ensure that the student received the correct answer. diff --git a/examples/06_loop_types/config/config.json b/examples/06_loop_types/config/config.json index 509d60d..375063a 100644 --- a/examples/06_loop_types/config/config.json +++ b/examples/06_loop_types/config/config.json @@ -3,7 +3,7 @@ { "title" : "Python - Distinguish for and while Loops", "command" : [ "submitty_count_ts -l python node for *.py", - "submitty_count_ts -l python node While *.py" ], + "submitty_count_ts -l python node while *.py" ], "points" : 2, "validation" : [ {