HOWZ1T / Ptypes

Ptypes/Test/BinaryTreeTest.php

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		$tree = new BinaryTree();
 		$tree->insert(new TreeNode(8))->insert(new TreeNode(5))->insert(new TreeNode(9))->insert(new TreeNode(4))->insert(new TreeNode(14))->insert(new TreeNode(6))->insert(new TreeNode(12));
-		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(4,5,6,8,9,12,14));
+		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(4, 5, 6, 8, 9, 12, 14));
 	}
 	
 	/** @test */
@@ -47,7 +47,7 @@ 
 		$root->right->right->left = new TreeNode(3);
 		
 		$tree = new BinaryTree($root);
-		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(9,5,1,7,2,12,8,4,3,11));
+		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(9, 5, 1, 7, 2, 12, 8, 4, 3, 11));
 	}
 	
 	/** @test */
@@ -66,7 +66,7 @@ 
 		$root->right->right->left = new TreeNode(3);
 		
 		$tree = new BinaryTree($root);
-		$this->assertEquals($tree->traverse(BinaryTree::PRE_ORDER), array(8,5,9,7,1,12,2,4,11,3));
+		$this->assertEquals($tree->traverse(BinaryTree::PRE_ORDER), array(8, 5, 9, 7, 1, 12, 2, 4, 11, 3));
 	}
 	
 	/** @test */
@@ -85,7 +85,7 @@ 
 		$root->right->right->left = new TreeNode(3);
 		
 		$tree = new BinaryTree($root);
-		$this->assertEquals($tree->traverse(BinaryTree::POST_ORDER), array(9,1,2,12,7,5,3,11,4,8));
+		$this->assertEquals($tree->traverse(BinaryTree::POST_ORDER), array(9, 1, 2, 12, 7, 5, 3, 11, 4, 8));
 	}
 	
 	/** @test */
@@ -104,7 +104,7 @@ 
 		
 		$tree = new BinaryTree($root);
 		$tree->delete(9);
-		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(1,3,4,5,8,11,12));
+		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(1, 3, 4, 5, 8, 11, 12));
 	}
 	
 	/** @test */
@@ -167,9 +167,9 @@ 
 		*/
 		
 		$nodes = $tree->traverse(BinaryTree::LEVEL_ORDER);
-		foreach($nodes as $i => $level)
+		foreach ($nodes as $i => $level)
 		{
-			foreach($level as $j => $node)
+			foreach ($level as $j => $node)
 			{
 				echo $node->value . " ";
 			}
@@ -187,6 +187,6 @@ 
 		$tree->insert(new TreeNode(80));
 		$tree->insert(new TreeNode(90));
 		$tree->delete(50);
-		$this->assertEquals((count($tree) + $tree->size()), 12);
+		$this->assertEquals((count($tree)+$tree->size()), 12);
 	}
 }
\ No newline at end of file

Ptypes/BinaryTree.php

Spacing +42 added lines, -42 removed lines

@@ -18,9 +18,9 @@ 
 	
 	private $count = 0;
 	
-	public function __construct(&$root=null)
+	public function __construct(&$root = null)
 	{
-		if($root != null)
+		if ($root != null)
 		{
 			$this->validate_parameter($root);
 		}
@@ -35,18 +35,18 @@ 
 		
 		$this->count++;
 		
-		if($this->root == null)
+		if ($this->root == null)
 		{
 			$this->root = $node;
 			return $this;
 		}
 		
 		$n = $this->root;
-		while(1)
+		while (1)
 		{	
-			if($node->value < $n->value)
+			if ($node->value < $n->value)
 			{
-				if($n->left == null)
+				if ($n->left == null)
 				{
 					$n->left = $node;
 					return $this;
@@ -54,9 +54,9 @@ 
 				
 				$n = $n->left;
 			}
-			else if($node->value > $n->value)
+			else if ($node->value > $n->value)
 			{
-				if($n->right == null)
+				if ($n->right == null)
 				{
 					$n->right = $node;
 					return $this;
@@ -64,7 +64,7 @@ 
 				
 				$n = $n->right;
 			}
-			else if($node->value == $n->value) //node is already in the tree, we do not create duplicates!
+			else if ($node->value == $n->value) //node is already in the tree, we do not create duplicates!
 			{
 				return $this;
 			}
@@ -73,7 +73,7 @@ 
 	
 	public function search($value)
 	{
-		if(gettype($value) != "integer" && gettype($value) != "int" && gettype($value) != "double")
+		if (gettype($value) != "integer" && gettype($value) != "int" && gettype($value) != "double")
 		{
 			throw new InvalidArgument("Expected a number, got: " . gettype($value) . " !\n");
 		}
@@ -83,22 +83,22 @@ 
 	
 	private function recursive_search($value, $node)
 	{
-		if($node == null)
+		if ($node == null)
 		{
 			return null;
 		}
 		
-		$eval = $value - $node->value;
-		if($eval == 0)
+		$eval = $value-$node->value;
+		if ($eval == 0)
 		{
 			return $node;
 		}
 		
-		if($eval < 0)
+		if ($eval < 0)
 		{
 			return $this->recursive_search($value, $node->left);
 		}
-		else if($eval > 0)
+		else if ($eval > 0)
 		{
 			return $this->recursive_search($value, $node->right);
 		}
@@ -106,7 +106,7 @@ 
 	
 	public function get_min($node)
 	{
-		while($node->left != null) //find left most leaf
+		while ($node->left != null) //find left most leaf
 		{
 			$node = $node->left;
 		}
@@ -118,14 +118,14 @@ 
 		$this->validate_parameter($nodeA);
 		$this->validate_parameter($nodeB);
 		
-		$eval = $nodeA->value - $nodeB->value;
+		$eval = $nodeA->value-$nodeB->value;
 		
-		if($eval < 0)
+		if ($eval < 0)
 		{
 			return -1; //go left
 		}
 		
-		if($eval > 0)
+		if ($eval > 0)
 		{
 			return 1; //go right
 		}
@@ -137,7 +137,7 @@ 
 	{
 		//check if value is in the tree
 		$node = $this->search($value); //this function also handles type checking
-		if($node != null)
+		if ($node != null)
 		{
 			$this->delete_recursive($this->root, $node->value);
 		}
@@ -148,28 +148,28 @@ 
 	
 	private function delete_recursive(&$parent, $value)
 	{
-		if($parent == null) 
+		if ($parent == null) 
 		{
 			return $parent;
 		}
 		
-		if($value < $parent->value)
+		if ($value < $parent->value)
 		{
 			$parent->left = $this->delete_recursive($parent->left, $value);
 		}
-		else if($value > $parent->value)
+		else if ($value > $parent->value)
 		{
 			$parent->right = $this->delete_recursive($parent->right, $value);
 		}
 		else
 		{
-			if($parent->left == null)
+			if ($parent->left == null)
 			{
 				$temp = $parent->right;
 				$parent = null;
 				return $temp;
 			}
-			else if($parent->right == null)
+			else if ($parent->right == null)
 			{
 				$temp = $parent->left;
 				$parent = null;
@@ -186,7 +186,7 @@ 
 	
 	public function size()
 	{
-		return $this->count + 1;
+		return $this->count+1;
 	}
 	
 	public function get_height()
@@ -196,7 +196,7 @@ 
 	
 	private function get_height_recursive($node)
 	{
-		if($node == null)
+		if ($node == null)
 		{
 			return 0;
 		}
@@ -204,25 +204,25 @@ 
 		$lHeight = $this->get_height_recursive($node->left);
 		$rHeight = $this->get_height_recursive($node->right);
 		
-		if($lHeight > $rHeight)
+		if ($lHeight > $rHeight)
 		{
-			return ($lHeight + 1);
+			return ($lHeight+1);
 		}
 		else
 		{
-			return ($rHeight + 1);
+			return ($rHeight+1);
 		}
 	}
 	
 	public function get_level($level)
 	{
-		if(gettype($level) != "integer" && gettype($level) != "int")
+		if (gettype($level) != "integer" && gettype($level) != "int")
 		{
 			throw new InvalidArgument("Expected an int, got: " . gettype($level) . " !");
 		}
 		
 		$h = $this->get_height();
-		if($level > $h)
+		if ($level > $h)
 		{
 			throw new InvalidArgument("Cannot get the level: " . $level . " as it is greater than the tree level of: " . $h . " !");
 		}
@@ -232,18 +232,18 @@ 
 		return $results;
 	}
 	
-	private function get_level_recursive($level, $node=null, &$results) //it is important that reference to results stays a reference (php pointer) !
+	private function get_level_recursive($level, $node = null, &$results) //it is important that reference to results stays a reference (php pointer) !
 	{
-		if($node == null)
+		if ($node == null)
 		{
 			return null;
 		}
 		
-		if($level == 1)
+		if ($level == 1)
 		{
 			array_push($results, $node);
 		}
-		else if($level > 1)
+		else if ($level > 1)
 		{
 			$this->get_level_recursive($level-1, $node->left, $results);
 			$this->get_level_recursive($level-1, $node->right, $results);
@@ -252,7 +252,7 @@ 
 	
 	public function traverse($order)
 	{
-		switch($order)
+		switch ($order)
 		{
 			case self::IN_ORDER:
 				$results = array();
@@ -270,7 +270,7 @@ 
 				return $results;
 				
 			case self::LEVEL_ORDER:
-				$results =array();
+				$results = array();
 				$this->level_order_traversal($results);
 				return $results;
 				
@@ -321,7 +321,7 @@ 
 	
 	private function level_order_traversal(&$results)
 	{
-		for($i = 1; $i <= $this->get_height(); $i++)
+		for ($i = 1; $i <= $this->get_height(); $i++)
 		{
 			$results[$i] = $this->get_level($i);
 		}
@@ -329,12 +329,12 @@ 
 	
 	private function validate_parameter($node)
 	{
-		if(gettype($node) != "object")
+		if (gettype($node) != "object")
 		{
 			throw new UnexpectedType("Expected a Ptypes\TreeNode, got: " . gettype($node));
 		}
 		
-		if(get_class($node) != "Ptypes\TreeNode")
+		if (get_class($node) != "Ptypes\TreeNode")
 		{
 			throw new UnexpectedType("Expected a Ptypes\TreeNode, got: " . get_class($node));
 		}
@@ -350,6 +350,6 @@ 
 	 */
 	public function count()
 	{
-		return $this->count + 1;
+		return $this->count+1;
 	}
 }
\ No newline at end of file