View GitHub Repository Ptypes

Schedule Inspection
Subscribe
Completed
Push — development ( 835d72...49dbbd )
by Dylan David
01:41
created
Status
Category
Toggle Patches
Ptypes/Test/BinaryTreeTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -28,7 +28,7 @@  discard block
 
 block discarded – undo
28 28 
 	{
29 29 
 		$tree = new BinaryTree();
30 30 
 		$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));
31 
-		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(4,5,6,8,9,12,14));
31 
+		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(4, 5, 6, 8, 9, 12, 14));
32 32 
 	}
33 33
34 34 
 	/** @test */
 
@@ -47,7 +47,7 @@  discard block
 
 block discarded – undo
47 47 
 		$root->right->right->left = new TreeNode(3);
48 48
49 49 
 		$tree = new BinaryTree($root);
50 
-		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(9,5,1,7,2,12,8,4,3,11));
50 
+		$this->assertEquals($tree->traverse(BinaryTree::IN_ORDER), array(9, 5, 1, 7, 2, 12, 8, 4, 3, 11));
51 51 
 	}
52 52
53 53 
 	/** @test */
 
@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
 		$root->right->right->left = new TreeNode(3);
67 67
68 68 
 		$tree = new BinaryTree($root);
69 
-		$this->assertEquals($tree->traverse(BinaryTree::PRE_ORDER), array(8,5,9,7,1,12,2,4,11,3));
69 
+		$this->assertEquals($tree->traverse(BinaryTree::PRE_ORDER), array(8, 5, 9, 7, 1, 12, 2, 4, 11, 3));
70 70 
 	}
71 71
72 72 
 	/** @test */
 
@@ -85,6 +85,6 @@  discard block
 
 block discarded – undo
85 85 
 		$root->right->right->left = new TreeNode(3);
86 86
87 87 
 		$tree = new BinaryTree($root);
88 
-		$this->assertEquals($tree->traverse(BinaryTree::POST_ORDER), array(9,1,2,12,7,5,3,11,4,8));
88 
+		$this->assertEquals($tree->traverse(BinaryTree::POST_ORDER), array(9, 1, 2, 12, 7, 5, 3, 11, 4, 8));
89 89 
 	}
90 90 
 }
91 91 
\ No newline at end of file
Please login to merge, or discard this patch.
Ptypes/BinaryTree.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch 
@@ -14,7 +14,7 @@  discard block
 
 block discarded – undo
14 14
15 15 
 	public $root;
16 16
17 
-	public function __construct($root=null)
17 
+	public function __construct($root = null)
18 18 
 	{
19 19 
 		$this->root = $root;
20 20 
 	}
 
@@ -23,18 +23,18 @@  discard block
 
 block discarded – undo
23 23 
 	{
24 24 
 		$this->validate_parameter($node);
25 25
26 
-		if($this->root == null)
26 
+		if ($this->root == null)
27 27 
 		{
28 28 
 			$this->root = $node;
29 29 
 			return $this;
30 30 
 		}
31 31
32 32 
 		$n = $this->root;
33 
-		while(1)
33 
+		while (1)
34 34 
 		{
35 
-			if($node->value < $n->value)
35 
+			if ($node->value < $n->value)
36 36 
 			{
37 
-				if($n->left == null)
37 
+				if ($n->left == null)
38 38 
 				{
39 39 
 					$n->left = $node;
40 40 
 					return $this;
 
@@ -42,9 +42,9 @@  discard block
 
 block discarded – undo
42 42
43 43 
 				$n = $n->left;
44 44 
 			}
45 
-			else if($node->value > $n->value)
45 
+			else if ($node->value > $n->value)
46 46 
 			{
47 
-				if($n->right == null)
47 
+				if ($n->right == null)
48 48 
 				{
49 49 
 					$n->right = $node;
50 50 
 					return $this;
 
@@ -52,7 +52,7 @@  discard block
 
 block discarded – undo
52 52
53 53 
 				$n = $n->right;
54 54 
 			}
55 
-			else if($node->value == $n->value) //node is already in the tree, we do not create duplicates!
55 
+			else if ($node->value == $n->value) //node is already in the tree, we do not create duplicates!
56 56 
 			{
57 57 
 				return $this;
58 58 
 			}
 
@@ -61,7 +61,7 @@  discard block
 
 block discarded – undo
61 61
62 62 
 	public function search($value)
63 63 
 	{
64 
-		if(gettype($value) != "integer" && gettype($value) != "int" && gettype($value) != "double")
64 
+		if (gettype($value) != "integer" && gettype($value) != "int" && gettype($value) != "double")
65 65 
 		{
66 66 
 			throw new InvalidArgument("Expected a number, got: " . gettype($value) . " !\n");
67 67 
 		}
 
@@ -71,22 +71,22 @@  discard block
 
 block discarded – undo
71 71
72 72 
 	private function recursive_search($value, $node)
73 73 
 	{
74 
-		if($node == null)
74 
+		if ($node == null)
75 75 
 		{
76 76 
 			return null;
77 77 
 		}
78 78
79 
-		$eval = $value - $node->value;
80 
-		if($eval == 0)
79 
+		$eval = $value-$node->value;
80 
+		if ($eval == 0)
81 81 
 		{
82 82 
 			return $node;
83 83 
 		}
84 84
85 
-		if($eval < 0)
85 
+		if ($eval < 0)
86 86 
 		{
87 87 
 			return $this->recursive_search($value, $node->left);
88 88 
 		}
89 
-		else if($eval > 0)
89 
+		else if ($eval > 0)
90 90 
 		{
91 91 
 			return $this->recursive_search($value, $node->right);
92 92 
 		}
 
@@ -104,7 +104,7 @@  discard block
 
 block discarded – undo
104 104
105 105 
 	public function traverse($order)
106 106 
 	{
107 
-		switch($order)
107 
+		switch ($order)
108 108 
 		{
109 109 
 			case self::IN_ORDER:
110 110 
 				$results = array();
 
@@ -169,12 +169,12 @@  discard block
 
 block discarded – undo
169 169
170 170 
 	private function validate_parameter($node)
171 171 
 	{
172 
-		if(gettype($node) != "object")
172 
+		if (gettype($node) != "object")
173 173 
 		{
174 174 
 			throw new UnexpectedType("Expected a Ptypes\TreeNode, got: " . gettype($node));
175 175 
 		}
176 176
177 
-		if(get_class($node) != "Ptypes\TreeNode")
177 
+		if (get_class($node) != "Ptypes\TreeNode")
178 178 
 		{
179 179 
 			throw new UnexpectedType("Expected a Ptypes\TreeNode, got: " . get_class($node));
180 180 
 		}
Please login to merge, or discard this patch.