Public accessors, introduce invalidargumentexceptions

pear · Nov 27, 2011 · 30ca562 · 30ca562
1 parent 2277bd6
commit 30ca562
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/Math/CompactedTuple.php b/Math/CompactedTuple.php
@@ -21,11 +21,13 @@
 
 require_once "PEAR.php";
 
-class Math_CompactedTuple {
+class Math_CompactedTuple
+{
 
     var $data;
 
-    function Math_CompactedTuple ($arg)
+    /** @todo Avoid work in constructor? */
+    public function __construct($arg)
     {
         if (is_array($arg)) {
             $this->data = $this->_genCompactedArray($arg);
@@ -35,46 +37,46 @@ function Math_CompactedTuple ($arg)
             $msg = "Incorrect parameter for Math_CompactedTuple constructor. ".
                     "Expecting an unidimensional array or a Math_Tuple object,".
                     " got '$arg'\n";
-            PEAR::raiseError($msg);
+            throw new InvalidArgumentException($msg);
         }
-        return true;
     }
 
-    function getSize() {
+    public function getSize() {
         return count($this->_genUnCompactedArray($this->data));
     }
 
-    function getCompactedSize() {
+    public function getCompactedSize() {
         return count($this->data);
     }
 
-    function getCompactedData() {
+    public function getCompactedData() {
         return $this->data;
     }
 
-    function getData() {
+    public function getData() {
         return $this->_genUnCompactedArray($this->data);
     }
 
-    function addElement($value) {
+    public function addElement($value) {
         $this->data[$value]++;
     }
 
-    function delElement($value) {
+    public function delElement($value) {
         if (in_array($value, array_keys($this->data))) {
             $this->data[$value]--;
-            if ($this->data[$value] == 0)
+            if ($this->data[$value] == 0) {
                 unset ($this->data[$value]);
+            }
             return true;
         }
         return PEAR::raiseError("value does not exist in compacted tuple");
     }
 
-    function hasElement($value) {
+    public function hasElement($value) {
         return in_array($value, array_keys($this->data));
     }
 
-    function _genCompactedArray($arr) {
+    public function _genCompactedArray($arr) {
         if (function_exists("array_count_values")) {
             return array_count_values($arr);
         } else {
@@ -86,7 +88,7 @@ function _genCompactedArray($arr) {
         }
     }
 
-    function _genUnCompactedArray($arr) {
+    public function _genUnCompactedArray($arr) {
         $out = array();
         foreach ($arr as $val=>$count) {
             for($i=0; $i < $count; $i++) {

diff --git a/Math/Vector.php b/Math/Vector.php
@@ -20,6 +20,7 @@
 //
 
 require_once "PEAR.php";
+require_once "Math/Vector/Exception.php";
 require_once "Math/Tuple.php";
 require_once "Math/VectorOp.php";