changed .10 to .70

2 files changed, 24 insertions, 5 deletions

diff --git a/4.N.10_Parser.php b/4.N.10_Parser.php
index d36f07a..8a3c497 100644
--- a/4.N.10_Parser.php
+++ b/4.N.10_Parser.php
@@ -187,19 +187,25 @@ foreach ($Class as $student)
 //*************Subtraction Yes/No *************
 
 	
-		if($incorrect_subtraction[$student] / $correct_subtraction[$student] <= .10)
+		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"
+			$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. 
+*/
 
 	
 } //end foreach
diff --git a/4.N.10_Parser.php~ b/4.N.10_Parser.php~
index 2900d83..d36f07a 100644
--- a/4.N.10_Parser.php~
+++ b/4.N.10_Parser.php~
@@ -176,18 +176,31 @@ foreach ($Class as $student)
 {
 	if( $num_correct[$student] >= ( .7 * ($num_submissions))
 	{
-		$understands_addition = "yes"
+		$understands_addition = true;
 	}
 	else
 	{
-		$understands_addition = "no"
+		$understands_addition = false;
 	}
 
 
 //*************Subtraction Yes/No *************
 
 	
-		if($subtraction_correct[$student] >= .10 * $ 
+		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"
+		}
+
+
 	
 } //end foreach