Merge pull request wangzheng0822#64 from SeasClouds/master

[php]四则运算bug修复

Author: wangzheng0822

php/.gitignore

@@ -1,2 +1,4 @@
 .idea
 vendor
+*my*
+Queue

php/08_stack/Compute.php

@@ -28,6 +28,14 @@ function expression($str)
  array_push($operStack, $arr[$i]);
  break;
  case '*':
+ $arrLen = count($operStack);
+ while ($operStack[$arrLen-1] === '/'){
+ compute($numStack, $operStack);
+ $arrLen--;
+ }
+ array_push($operStack, $arr[$i]);
+ break;
+
  case '/':
  case '(':
  array_push($operStack, $arr[$i]);
@@ -70,7 +78,9 @@ function compute(&$numStack, &$operStack){
  case '-':
  array_push($numStack, array_pop($numStack) - $num);
  break;
- 
+ case '(':
+ throw new \Exception("不匹配的(", 2);
+ break;
  }
 }
 expression('-1+2-(1+2*3)');

php/09_queue/Sequential.php

@@ -0,0 +1,60 @@
+<?php
+
+class LoopQueue
+{ 
+ private $MaxSzie;
+ private $data = [];
+ private $head = 0;
+ private $tail = 0;
+
+ /**
+ * 初始化队列大小 最后的位置不存放数据,实际大小 = size++
+ */
+ public function __construct($size = 10)
+ {
+ $this->MaxSzie = ++$size;
+ }
+
+ /**
+ * 队列满条件 ($this->tail+1) % $this->MaxSzie == $this->head
+ */
+ public function enQueue($data)
+ {
+ if (($this->tail+1) % $this->MaxSzie == $this->head)
+ return -1;
+
+ $this->data[$this->tail] = $data;
+ $this->tail = (++$this->tail) % $this->MaxSzie;
+ }
+
+ public function deQueue()
+ {
+ if ($this->head == $this->tail)
+ return NULL;
+ 
+ $data = $this->data[$this->head];
+ unset($this->data[$this->head]);
+ $this->head = (++$this->head) % $this->MaxSzie;
+ return $data;
+ }
+
+ public function getLength()
+ {
+ return ($this->tail - $this->head + $this->MaxSzie) % $this->MaxSzie;
+ }
+}
+
+$queue = new LoopQueue(4);
+// var_dump($queue);
+$queue->enQueue(1);
+$queue->enQueue(2);
+$queue->enQueue(3);
+$queue->enQueue(4);
+// $queue->enQueue(5);
+var_dump($queue->getLength());
+$queue->deQueue();
+$queue->deQueue();
+$queue->deQueue();
+$queue->deQueue();
+$queue->deQueue();
+var_dump($queue);

php/11_sort/Sort.php

@@ -0,0 +1,24 @@
+<?php
+
+function insertSort(&$arr)
+{
+ $i = 0;
+ $len = count($arr);
+
+ while($i < $len){
+ $data = $arr[$i+1];
+ for ($j = $i;$j >=0 ;$j-- ){
+ if ($data >= $arr[$j]){
+ array_splice($arr, $i+1, 1);
+ array_splice($arr, ++$j, 0, $data);
+ break;
+ }
+ }
+ 
+ $i++;
+ }
+}
+
+$arr = [1,4,6,2,3,5,4];
+insertSort($arr);
+var_dump($arr);