incorporating strikes (inability to correct an over or under payment)

2 files changed, 47 insertions, 27 deletions

diff --git a/4.N.10_Parser.php b/4.N.10_Parser.php
index 8a3c497..593d5e7 100644
--- a/4.N.10_Parser.php
+++ b/4.N.10_Parser.php
@@ -186,27 +186,34 @@ foreach ($Class as $student)
 
 //*************Subtraction Yes/No *************
 
-	
-		if($incorrect_subtraction[$student] / ($correct_subtraction[$student] + $incorrect_subtractions[$student]) <= .70)
-		{
-			$understands_subtraction = "y"; //we cannot use bool as there is a third case of "undetermined" with subtraction. 
-		}
-		elseif($incorrect_subtraction[$student] == NULL || $incorrect_subtraction[$student] == 0)
-		{
-			$understands_subtraction = "u" //undetermined
-		}
-		else
-		{
-			$understands_subtraction = "n"
-		}
+
+	if($incorrect_subtraction[$student] / ($correct_subtraction[$student] + $incorrect_subtractions[$student]) <= .70)
+	{
+		$understands_subtraction = "y"; //we cannot use bool as there is a third case of "undetermined" with subtraction. 
+	}
+	elseif($incorrect_subtraction[$student] == NULL || $incorrect_subtraction[$student] == 0)
+	{
+		$understands_subtraction = "u" //undetermined
+	}
+	else
+	{
+		$understands_subtraction = "n"
+	}
 
 /*************** Strikes *******************
 *
 * If a student overpays and then increases their payment, or underpays, followed by an even lower payment 
 * it can be inferred the student does not understand the concepts of addition or subtraction with money.
-* If for > 10% of the questions the student makes this mistake. He or she gets a "no" for addition and subtraction. 
+* If for > 10% of the total question_id's the student makes this mistake. He or she gets a "no" for addition and subtraction. 
 */
 
+	if(!($strikes[$student] / $num_questions[$student] <= .10))
+	{
+		$understands_addition = false;
+		$understands_subtraction = "n";
+	}
+	
+
 	
 } //end foreach
 			
diff --git a/4.N.10_Parser.php~ b/4.N.10_Parser.php~
index d36f07a..593d5e7 100644
--- a/4.N.10_Parser.php~
+++ b/4.N.10_Parser.php~
@@ -186,20 +186,33 @@ foreach ($Class as $student)
 
 //*************Subtraction Yes/No *************
 
-	
-		if($incorrect_subtraction[$student] / $correct_subtraction[$student] <= .10)
-		{
-			$understands_subtraction = "y"; //we cannot use bool as there is a third case of "undetermined" with subtraction. 
-		}
-		elseif($incorrect_subtraction[$student] == NULL || $incorrect_subtraction[$student] == 0)
-		{
-			$understands_subtraction = "u"
-		}
-		else
-		{
-			$understands_subtraction = "n"
-		}
 
+	if($incorrect_subtraction[$student] / ($correct_subtraction[$student] + $incorrect_subtractions[$student]) <= .70)
+	{
+		$understands_subtraction = "y"; //we cannot use bool as there is a third case of "undetermined" with subtraction. 
+	}
+	elseif($incorrect_subtraction[$student] == NULL || $incorrect_subtraction[$student] == 0)
+	{
+		$understands_subtraction = "u" //undetermined
+	}
+	else
+	{
+		$understands_subtraction = "n"
+	}
+
+/*************** Strikes *******************
+*
+* If a student overpays and then increases their payment, or underpays, followed by an even lower payment 
+* it can be inferred the student does not understand the concepts of addition or subtraction with money.
+* If for > 10% of the total question_id's the student makes this mistake. He or she gets a "no" for addition and subtraction. 
+*/
+
+	if(!($strikes[$student] / $num_questions[$student] <= .10))
+	{
+		$understands_addition = false;
+		$understands_subtraction = "n";
+	}
+	
 
 	
 } //end foreach