accounting for compound[] and compound_correct[]

1 files changed, 27 insertions, 8 deletions

diff --git a/order_of_operations_parser.php b/order_of_operations_parser.php
index d2d5e54..519b695 100644
--- a/order_of_operations_parser.php
+++ b/order_of_operations_parser.php
@@ -180,28 +180,47 @@ for (i=0;i<=$numRecords;i++)
 		
 		// can simply not use regexp but replace with a literal reg expression	
 	if(preg_match("+", $equation) && (preg_match("-", $equation) ||  preg_match("/", $equation)  || preg_match("*", $equation)))
+	{
+		
+		$compound[tok[0]]++;			//NOTE compound_incorrect is implicit
+		if ($tok[3] = "1") //if correct
 		{
-			
-			if ($tok[3] = "1") //is it also correct? put it in a different associative array with the same key
-						{
-							$compound_correct[tok[0]]++;
-						}
+			$compound_correct[tok[0]]++;
 		}
+	}
 	elseif( (preg_match("-", $equation)) && (preg_match("+", $equation) ||  preg_match("\/", $equation)  || preg_match("*", $equation)))
+	{
+		$compound[tok[0]]++;
+		if ($tok[3] = "1") //if correct
 		{
-		
+			$compound_correct[tok[0]]++;
 		}
+	
+	}
 	elseif(preg_match($"\/", $equation) && (preg_match("+", $equation) ||  preg_match("-", $equation)  || preg_match("*", $equation)))
+	{
+		$compound[tok[0]]++;
+		if ($tok[3] = "1") //if correct
 		{
-		
+			$compound_correct[tok[0]]++;
 		}
+	}
 	elseif( (preg_match($"*", $equation)) && (preg_match("+", $equation) ||  preg_match("-", $equation)  || preg_match("\/", $equation)))
+	{
+		$compound[tok[0]]++;
+		if ($tok[3] = "1") //if correct
 		{
-		
+			$compound_correct[tok[0]]++;
 		}
+	
+	}
 	else
 	{
 		$non_compound[tok[0]++;
+		if ($tok[3] = "1") //if correct
+		{
+			$compound_correct[tok[0]]++;
+		}
 	}