WIP

Trie.php

@@ -1,13 +1,22 @@
 <?php
 
 
-class Trie implements ArrayAccess, Countable //, Iterator
+class Trie implements ArrayAccess, IteratorAggregate //, Countable //, Iterator
 {
     public array $noeud = [];
-    private array $cles_en_cours = [];
-    private mixed $valeur_en_cours;
-    private $marcheur;
-    private $nb_branches = 0;
+
+    public function offsetSet($cles, $valeur): void {
+        if (!count($cles)) {
+            throw new \OutOfBoundsException("Liste de clés vide.");
+        }
+        $cle = array_shift($cles);
+        if (!isset($this->noeud[$cle])) $this->noeud[$cle] = new Trie();
+        if (count($cles)) {
+            $this->noeud[$cle]->offsetSet($cles, $valeur);
+        } else {
+            $this->noeud[$cle] = $valeur;
+        }
+    }
 
     // ArrayAccess
     public function offsetExists($cles): bool {
@@ -18,7 +27,7 @@ class Trie implements ArrayAccess, Countable //, Iterator
         if (count($cles)) {
             return $this->noeud[$cle]->offsetExists($cles);
         } else {
-            return isset($this->noeud[$cles]);
+            return isset($this->noeud[$cles[0]]);
         }
     }
 
@@ -35,72 +44,27 @@ class Trie implements ArrayAccess, Countable //, Iterator
         }
     }
 
-    public function offsetSet($cles, $valeur): void {
-        if (!count($cles)) {
-            throw new \OutOfBoundsException("Liste de clés vide.");
-            return;
-        }
-        $cle = array_shift($cles);
-        if (!isset($this->noeud[$cle])) $this->noeud[$cle] = new Trie();
-        if (count($cles)) {
-            $this->noeud[$cle]->offsetSet($cles, $valeur);
-        } else {
-            $this->noeud[$cle] = $valeur;
-        }
-        $this->nb_branches++;
-    }
-
     public function offsetUnset($cles): void {
-        if ($this->offsetExists(cles)) {
+        if ($this->offsetExists($cles)) {
             $cle = array_shift($cles);
             if (count($cles)) {
                 $this->noeud[$cle]->offsetUnset($cles);
             } else {
                 unset($this->noeud[$cle]);
             }
-            $this->nb_branches--;
         }
     }
 
-    // Countable
-    public function count(): int {
-        return $this->nb_branches;
-    }
-
-/*
-    // Iterator
-    public function marcheurs(): generator {
+    // IteratorAggregate
+    public function getIterator(): Generator {
         foreach ($this->noeud as $cle => $branche) {
             if ($branche instanceof Trie) {
                 foreach($branche as $sous_cles => $feuille) {
-                    $this->cles_en_cours = [$cle, ...$sous_cles];
-                    yield $feuille;
+                    yield [$cle, ...$sous_cles] => $feuille;
                 }
             } else {
-                $this->cles_en_cours = [$cle];
-                yield $branche;
+                yield $cle => $branche;
             }
         }
     }
-
-    public function current(): mixed {
-        return $this->marcheur->current();
-    }
-
-    public function key(): array {
-        return $this->cles_en_cours;
-    }
-
-    public function next(): void {
-        $this->marcheur->next();
-    }
-
-    public function rewind(): void {
-        $this->marcheur = $this->marcheurs();
-    }
-
-    public function valid(): bool {
-        return $this->marcheur->valid();
-    }
-*/
 }