Compare commits

..

No commits in common. "c20d2324e93f4be6f7386e0c04776d7b9c1cae52" and "6ee909914d7aca7c88d8247417d8c9b4ef033c79" have entirely different histories.

3 changed files with 42 additions and 66 deletions

View File

@ -2,23 +2,7 @@
include_once "dico.php";
$randmax = mt_getrandmax() + 1;
function gaussienne($moyenne = 0, $ecartType = 1.0): float {
global $randmax;
$u = 0;
$v = 0;
$u = (mt_rand() + 1) / $randmax;
$v = (mt_rand() + 1) / $randmax;
$z = sqrt(-2.0 * log($u)) * cos(2.0 * M_PI * $v);
return $z * $ecartType + $moyenne;
}
class Grille implements ArrayAccess
{
class Grille implements ArrayAccess {
public $grille;
public $hauteur;
public $largeur;
@ -27,8 +11,6 @@ class Grille implements ArrayAccess
private $nb_positions;
public $lignes = [];
public $colonnes = [];
public $valide = false;
private $id;
public function __construct($hauteur, $largeur)
{
@ -62,38 +44,36 @@ class Grille implements ArrayAccess
return $colonne;
}
public function gen_grilles($i = 0, $lettres_ligne = NULL)
public function gen_grilles($i = 0, $lettres_suivantes_ligne = NULL)
{
[$x, $y] = $this->positions[$i];
if ($x == 0) {
$lettres_ligne = $this->lettres_suivantes[$this->largeur];
$lettres_suivantes_ligne = $this->lettres_suivantes[$this->largeur];
}
$lettres_colonne = $this->lettres_suivantes[$this->hauteur];
for ($y2 = 0; $y2 < $y; $y2++) {
$lettres_colonne = $lettres_colonne->noeud[$this->grille[$y2][$x]];
}
$lettres_communes = array_intersect_key(
$lettres_ligne->noeud,
$lettres_colonne->noeud
$lettres_suivantes_colonne = $this->lettres_suivantes[$this->hauteur];
for ($y2 = 0; $y2 < $y; $y2++)
$lettres_suivantes_colonne = $lettres_suivantes_colonne->noeud[$this->grille[$y2][$x]];
$lettres_communes = array_intersect(
array_keys($lettres_suivantes_ligne->noeud),
array_keys($lettres_suivantes_colonne->noeud)
);
foreach ($lettres_communes as $lettre => $_) {
$lettres_communes[$lettre] = count($lettres_ligne->noeud[$lettre]) * count($lettres_colonne->noeud[$lettre]) * gaussienne(1, 5);
foreach($lettres_communes as $lettre => $_) {
$lettres_communes[$lettre] = count($lettres_suivantes_colonne[$lettre]) * count($lettres_suivantes_colonne[$lettre]);
}
uksort($lettres_communes, function($a, $b) use ($lettres_communes) {
return $lettres_communes[$b] <=> $lettres_communes[$a];
usort($lettres_communes, function ($a, $b) {
return mt_rand(-1, 1);
});
$lettres_communes = array_slice($lettres_communes, 0, 3);
foreach ($lettres_communes as $lettre => $_) {
foreach ($lettres_communes as $lettre) {
$this->grille[$y][$x] = $lettre;
$mots = [];
if ($x == $this->largeur - 1) $mots = explode(" ", $this->get_ligne($y, $this->largeur));
else if ($lettre == " ") $mots = explode(" ", $this->get_ligne($y, $x));
else $mots = [];
$this->lignes[$y] = array_filter($mots, function ($mot) {
$this->lignes[$y] = array_filter($mots, function($mot) {
return strlen($mot) >= 2;
});
if (count($this->lignes[$y])) {
@ -114,23 +94,24 @@ class Grille implements ArrayAccess
}
if ($i < $this->nb_positions - 1) {
yield from $this->gen_grilles($i + 1, $lettres_ligne->noeud[$lettre]);
yield from $this->gen_grilles($i + 1, $lettres_suivantes_ligne->noeud[$lettre]);
} else {
yield $this;
}
}
}
public function genere($id)
{
public function genere() {
session_regenerate_id();
$id = session_id();
mt_srand(crc32($id));
$grilles = $this->gen_grilles();
$grilles->current();
if ($grilles->valid()) {
$this->save($id);
return true;
$this->save();
return $id;
} else {
return false;
}
@ -144,9 +125,7 @@ class Grille implements ArrayAccess
return hash('sha256', $string);
}
public function save($id)
{
session_id($id);
public function save() {
session_start(["use_cookies" => false]);
$_SESSION["$this->largeur,$this->hauteur"] = implode(
@ -158,35 +137,32 @@ class Grille implements ArrayAccess
$this->grille
)
);
var_dump($_SESSION);
}
public function load($id)
{
public function load($id) {
session_id($id);
session_start(["use_cookies" => false]);
if (!isset($_SESSION["$this->largeur,$this->hauteur"])) {
var_dump($_SESSION);
return false;
}
foreach (str_split($_SESSION["$this->largeur,$this->hauteur"], $this->largeur) as $y => $ligne) {
foreach (str_split($ligne) as $x => $lettre) {
foreach(str_split($ligne) as $x => $lettre) {
$this->grille[$y][$x] = $lettre;
}
}
for ($y = 0; $y < $this->hauteur; $y++) {
$mots = explode(" ", $this->get_ligne($y, $this->largeur));
$this->lignes[$y] = array_filter($mots, function ($mot) {
$this->lignes[$y] = array_filter($mots, function($mot) {
return strlen($mot) >= 2;
});
}
for ($x = 0; $x < $this->largeur; $x++) {
$mots = explode(" ", $this->get_colonne($x, $this->hauteur));
$this->colonnes[$x] = array_filter($mots, function ($mot) {
$this->colonnes[$x] = array_filter($mots, function($mot) {
return strlen($mot) >= 2;
});
}
@ -195,23 +171,19 @@ class Grille implements ArrayAccess
}
public function offsetExists(mixed $offset): bool
{
public function offsetExists(mixed $offset): bool {
return isset($this->grille[$offset]);
}
public function offsetGet(mixed $offset): mixed
{
public function offsetGet(mixed $offset): mixed {
return $this->grille[$offset];
}
public function offsetSet(mixed $offset, mixed $value): void
{
public function offsetSet(mixed $offset, mixed $value): void {
$this->grille[$offset] = $value;
}
public function offsetUnset(mixed $offset): void
{
public function offsetUnset(mixed $offset): void {
unset($this->grille[$offset]);
}
}

View File

@ -1,7 +1,8 @@
<?php
class Trie implements ArrayAccess, IteratorAggregate, Countable {
class Trie implements ArrayAccess, IteratorAggregate, Countable
{
public array $noeud = [];
private $nb_branches = 0;
@ -78,3 +79,5 @@ class Trie implements ArrayAccess, IteratorAggregate, Countable {
return $this->nb_branches;
}
}

View File

@ -31,8 +31,8 @@ $grille = new Grille($hauteur, $largeur);
if (!isset($_GET["grille"]) || $_GET["grille"] == "") {
do {
$id = uniqid();
} while (!$grille->genere($id));
$id = $grille->genere();
} while (!$id);
$_GET["grille"] = $id;
header("Location: " . dirname($_SERVER['DOCUMENT_URI']) . "?" . http_build_query($_GET));
@ -41,10 +41,11 @@ if (!isset($_GET["grille"]) || $_GET["grille"] == "") {
$id = htmlspecialchars($_GET["grille"]);
$grille_valide = $grille->load($id) || $grille->genere($id);
$grille_valide = $grille->load($id) || $grille->genere();
mt_srand(crc32($id));
if ($grille_valide) {
mt_srand(crc32($id));
$definitions_horizontales = [];
for ($y = 0; $y < $hauteur; $y++) {
$definitions_horizontales[$y] = [];