commit 643056ce3862d58bc3c52f8603476d0f5ef3de92
parent 205806982bfa1ad1de2e1ad85a4bd83fa310b2da
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date: Wed, 2 Feb 2011 20:29:44 +0100
Merge branch 'master' of https://github.com/jsmaniac/2011-m1s2-ter
Diffstat:
2 files changed, 209 insertions(+), 209 deletions(-)
diff --git a/code/serveur/php/pticlic.php b/code/serveur/php/pticlic.php
@@ -1,222 +1,222 @@
-<?php
-// Requête : http://serveur/pticlic.php?action=getparties&nb=2&mode=normal&user=foo&passwd=bar
-
-$email_admin = ''; // Adresse e-mail Administrateur.
-
-$SQL_DBNAME = (dirname(__FILE__) . "/db");
-
-function mDie($err,$msg)
-{
- echo "{ error:".json_encode("".$err).", msg:".json_encode("".$msg)."}";
- exit;
-}
-
-if (!$db = new SQLite3('db')) {
- mDie(1,"Erreur lors de l'ouverture de la base de données SQLite3");
-}
-
-function initdb() {
- global $db;
- $db->exec("insert into user(login, mail, hash_passwd) values('foo', 'foo@isp.com', '".md5('bar')."');");
-}
-
-// initdb();
-
-if(!isset($_GET['action']) || !isset($_GET['user']) || !isset($_GET['passwd']))
- mDie(2,"La requête est incomplète");
-
-// Login
-$action = $_GET['action'];
-$user = $_GET['user'];
-$hash_passwd = md5($_GET['passwd']);
-if ($hash_passwd !== $db->querySingle("SELECT hash_passwd FROM user WHERE login='".SQLite3::escapeString($user)."';"))
- mDie(3,"Utilisateur non enregistré ou mauvais mot de passe");
-
-function random_node() {
- global $db;
- return $db->querySingle("select eid from node where eid = (abs(random()) % (select max(eid) from node))+1 or eid = (select max(eid) from node where eid > 0) order by eid limit 1;");
-}
-
-// TODO : Yoann : peut-être faire une classe create_game avec les fonctions ci-dessous comme méthodes ?
-
-function cg_build_result_sets($cloudSize, $centerEid, $r1, $r2) {
- global $db;
- // 'w' => weight (poids), 'd' => difficulté, 's' => select
- // Le select doit ranvoyer trois colonnes :
- // eid => l'eid du mot à mettre dans le nuage,
- // r1 => la probabilité pour que le mot soit dans r1, entre -1 et 1 (négatif = ne devrait pas y être, positif = devrait y être à coup sûr, 0 = on sait pas).
- // TODO : comment mettre un poids sur random, sachant qu'il ne peut / devrait pas être dans ces select, mais plutôt un appel à random_node() ?
- $typer1r2 = "type in ($r1, $r2)";
- $sources = array(
- // Voisins 1 saut du bon type (= relations déjà existantes)
- array('w'=>10, 'd'=>1, 's'=>"select end as eid, type = $r1 as r1, type = $r2 as r2 from relation where start = $centerEid and $typer1r2 order by random();"),
- // Voisins 1 saut via r_associated (0), donc qu'on voudrait spécifier si possible.
- array('w'=>10, 'd'=>2, 's'=>"select end as eid, 0 as r1, 0 as r2 from relation where start = $centerEid and type = 0 order by random();"),
- // Voisins 1 saut via les autres relations
- array('w'=>10, 'd'=>3, 's'=>"select end as eid, 0 as r1, 0 as r2 from relation where start = $centerEid and type not in (0, $r1, $r2) order by random();"),
- // Voisins 2 sauts, avec un mix de R1 et R2 pour les liens. Par ex [ A -R1-> B -R2-> C ] ou bien [ A -R2-> B -R2-> C ]
- // Version optimisée de : "select end as eid from relation where $typer1r2 and start in oneHopWithType order by random();"
- array('w'=>10, 'd'=>4, 's'=>"select B.end as eid, ((A.type = $r1) + (B.type = $r1)) / 3 as r1, ((A.type = $r2) + (B.type = $r2)) / 3 as r2 from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.$typer1r2 order by random();"),
- // Voisins 1 saut r1/r2 + 1 saut synonyme
- // Version optimisée de : "select end as eid from relation where start in oneHopWithType and type = 5 order by random();"
- array('w'=>10, 'd'=>5, 's'=>"select B.end as eid, (A.type = $r1) * 0.75 as r1, (A.type = $r2) * 0.75 as r2 from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.type = 5 order by random();"),
- // Version optimisée de : "select end as eid from relation where start in (select end from relation where start = $centerEid and type = 5) and $typer1r2 order by random();"
- array('w'=>10, 'd'=>6, 's'=>"select B.end as eid, (B.type = $r1) * 0.75 as r1, (B.type = $r2) * 0.75 as r2 from relation as A, relation as B where A.start = $centerEid and A.type = 5 and B.start = A.end and B.$typer1r2 order by random();"),
- // Voisins 2 sauts (tous)
- array('w'=>10, 'd'=>7, 's'=>"select end as eid, 0.1 as r1, 0.1 as r2 from relation where start in (select end from relation where start = $centerEid) order by random();"),
- // Centre pointe vers X, M pointe vers X aussi, on prend M.
- // Version optimisée de : "select start as eid from relation where end in (select end from relation where start = $centerEid) and type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) order by random();"
- // Ce n'est toujours pas ça… : "select eid from (select B.start as eid from relation as A, relation as B where A.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and A.start = $centerEid and B.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and B.end = A.end limit 1) order by random();"
- // Tordu, mais ça marche \o/ . En fait il faut empêcher l'optimiseur de ramener le random avant le limit (et l'optimiseur est malin… :)
- array('w'=>10, 'd'=>8, 's'=>"select x as eid, -0.1 as r1, -0.1 as r2 from (select x from (select X.eid + Y.dumb as x from (select B.start as eid from relation as A, relation as B where A.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and A.start = 74860 and B.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and B.end = A.end limit $cloudSize) as X, (select 0 as dumb) as Y)) order by random();"),
- 'rand' => array('w'=>10, 's'=>false) // random. Le r1 et r2 de random sont juste en-dessous
- );
-
- $sumWeights = 0;
- foreach ($sources as $k => $x) {
+<?php
+// Requête : http://serveur/pticlic.php?action=getparties&nb=2&mode=normal&user=foo&passwd=bar
+
+$email_admin = ''; // Adresse e-mail Administrateur.
+
+$SQL_DBNAME = (dirname(__FILE__) . "/db");
+
+function mDie($err,$msg)
+{
+ echo "{ error:".json_encode("".$err).", msg:".json_encode("".$msg)."}";
+ exit;
+}
+
+if (!$db = new SQLite3('db')) {
+ mDie(1,"Erreur lors de l'ouverture de la base de données SQLite3");
+}
+
+function initdb() {
+ global $db;
+ $db->exec("insert into user(login, mail, hash_passwd) values('foo', 'foo@isp.com', '".md5('bar')."');");
+}
+
+// initdb();
+
+if(!isset($_GET['action']) || !isset($_GET['user']) || !isset($_GET['passwd']))
+ mDie(2,"La requête est incomplète");
+
+// Login
+$action = $_GET['action'];
+$user = $_GET['user'];
+$hash_passwd = md5($_GET['passwd']);
+if ($hash_passwd !== $db->querySingle("SELECT hash_passwd FROM user WHERE login='".SQLite3::escapeString($user)."';"))
+ mDie(3,"Utilisateur non enregistré ou mauvais mot de passe");
+
+function random_node() {
+ global $db;
+ return $db->querySingle("select eid from node where eid = (abs(random()) % (select max(eid) from node))+1 or eid = (select max(eid) from node where eid > 0) order by eid limit 1;");
+}
+
+// TODO : Yoann : peut-être faire une classe create_game avec les fonctions ci-dessous comme méthodes ?
+
+function cg_build_result_sets($cloudSize, $centerEid, $r1, $r2) {
+ global $db;
+ // 'w' => weight (poids), 'd' => difficulté, 's' => select
+ // Le select doit ranvoyer trois colonnes :
+ // eid => l'eid du mot à mettre dans le nuage,
+ // r1 => la probabilité pour que le mot soit dans r1, entre -1 et 1 (négatif = ne devrait pas y être, positif = devrait y être à coup sûr, 0 = on sait pas).
+ // TODO : comment mettre un poids sur random, sachant qu'il ne peut / devrait pas être dans ces select, mais plutôt un appel à random_node() ?
+ $typer1r2 = "type in ($r1, $r2)";
+ $sources = array(
+ // Voisins 1 saut du bon type (= relations déjà existantes)
+ array('w'=>10, 'd'=>1, 's'=>"select end as eid, type = $r1 as r1, type = $r2 as r2 from relation where start = $centerEid and $typer1r2 order by random();"),
+ // Voisins 1 saut via r_associated (0), donc qu'on voudrait spécifier si possible.
+ array('w'=>10, 'd'=>2, 's'=>"select end as eid, 0 as r1, 0 as r2 from relation where start = $centerEid and type = 0 order by random();"),
+ // Voisins 1 saut via les autres relations
+ array('w'=>10, 'd'=>3, 's'=>"select end as eid, 0 as r1, 0 as r2 from relation where start = $centerEid and type not in (0, $r1, $r2) order by random();"),
+ // Voisins 2 sauts, avec un mix de R1 et R2 pour les liens. Par ex [ A -R1-> B -R2-> C ] ou bien [ A -R2-> B -R2-> C ]
+ // Version optimisée de : "select end as eid from relation where $typer1r2 and start in oneHopWithType order by random();"
+ array('w'=>10, 'd'=>4, 's'=>"select B.end as eid, ((A.type = $r1) + (B.type = $r1)) / 3 as r1, ((A.type = $r2) + (B.type = $r2)) / 3 as r2 from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.$typer1r2 order by random();"),
+ // Voisins 1 saut r1/r2 + 1 saut synonyme
+ // Version optimisée de : "select end as eid from relation where start in oneHopWithType and type = 5 order by random();"
+ array('w'=>10, 'd'=>5, 's'=>"select B.end as eid, (A.type = $r1) * 0.75 as r1, (A.type = $r2) * 0.75 as r2 from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.type = 5 order by random();"),
+ // Version optimisée de : "select end as eid from relation where start in (select end from relation where start = $centerEid and type = 5) and $typer1r2 order by random();"
+ array('w'=>10, 'd'=>6, 's'=>"select B.end as eid, (B.type = $r1) * 0.75 as r1, (B.type = $r2) * 0.75 as r2 from relation as A, relation as B where A.start = $centerEid and A.type = 5 and B.start = A.end and B.$typer1r2 order by random();"),
+ // Voisins 2 sauts (tous)
+ array('w'=>10, 'd'=>7, 's'=>"select end as eid, 0.1 as r1, 0.1 as r2 from relation where start in (select end from relation where start = $centerEid) order by random();"),
+ // Centre pointe vers X, M pointe vers X aussi, on prend M.
+ // Version optimisée de : "select start as eid from relation where end in (select end from relation where start = $centerEid) and type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) order by random();"
+ // Ce n'est toujours pas ça… : "select eid from (select B.start as eid from relation as A, relation as B where A.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and A.start = $centerEid and B.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and B.end = A.end limit 1) order by random();"
+ // Tordu, mais ça marche \o/ . En fait il faut empêcher l'optimiseur de ramener le random avant le limit (et l'optimiseur est malin… :)
+ array('w'=>10, 'd'=>8, 's'=>"select x as eid, -0.1 as r1, -0.1 as r2 from (select x from (select X.eid + Y.dumb as x from (select B.start as eid from relation as A, relation as B where A.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and A.start = 74860 and B.type not in (4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001) and B.end = A.end limit $cloudSize) as X, (select 0 as dumb) as Y)) order by random();"),
+ 'rand' => array('w'=>10, 's'=>false) // random. Le r1 et r2 de random sont juste en-dessous
+ );
+
+ $sumWeights = 0;
+ foreach ($sources as $k => $x) {
$sumWeights += $x['w'];
$sources[$k]['rsPos'] = 0;
- $sources[$k]['rsSize'] = 0;
- if ($x['s'] !== false) {
- $sources[$k]['resultSet'] = array();
- $res = $db->query($x['s']);
- $i = 0;
- while ($i < 10 && $sources[$k]['resultSet'][] = $res->fetchArray()) {
+ $sources[$k]['rsSize'] = 0;
+ if ($x['s'] !== false) {
+ $sources[$k]['resultSet'] = array();
+ $res = $db->query($x['s']);
+ $i = 0;
+ while ($i < 10 && $sources[$k]['resultSet'][] = $res->fetchArray()) {
$i++;
- $sources[$k]['rsSize']++;
- }
- } else {
- $sources[$k]['resultSet'] = array();
- for ($i = 0; $i < 10; $i++) {
- $sources[$k]['resultSet'][] = array('eid'=>random_node(), 'r1'=>-1, 'r2'=>-1);
- $sources[$k]['rsSize']++;
- }
- }
- }
- return array($sources, $sumWeights);
-}
-
-function cg_choose_relations() {
- $relations = array(5, 7, 9, 10);
- $r1 = rand(0,count($relations)-1);
- $r2 = rand(0,count($relations)-2);
- if ($r2 >= $r1) $r2++;
- $r1 = $relations[$r1];
- $r2 = $relations[$r2];
- return array($r1, $r2);
-}
-
-function cg_build_cloud($cloudSize, $sources, $sumWeights) {
- // On boucle tant qu'il n'y a pas eu au moins 2 sources épuisées
- $cloud = array();
- $nbFailed = 0;
+ $sources[$k]['rsSize']++;
+ }
+ } else {
+ $sources[$k]['resultSet'] = array();
+ for ($i = 0; $i < 10; $i++) {
+ $sources[$k]['resultSet'][] = array('eid'=>random_node(), 'r1'=>-1, 'r2'=>-1);
+ $sources[$k]['rsSize']++;
+ }
+ }
+ }
+ return array($sources, $sumWeights);
+}
+
+function cg_choose_relations() {
+ $relations = array(5, 7, 9, 10);
+ $r1 = rand(0,count($relations)-1);
+ $r2 = rand(0,count($relations)-2);
+ if ($r2 >= $r1) $r2++;
+ $r1 = $relations[$r1];
+ $r2 = $relations[$r2];
+ return array($r1, $r2);
+}
+
+function cg_build_cloud($cloudSize, $sources, $sumWeights) {
+ // On boucle tant qu'il n'y a pas eu au moins 2 sources épuisées
+ $cloud = array();
+ $nbFailed = 0;
$i = 0;
- while ($i < $cloudSize && $nbFailed < 5*$cloudSize) {
- // On choisit une source aléatoire en tennant compte des poids.
- $rands = rand(1,$sumWeights);
- $sumw = 0;
- $src = $sources['rand'];
- foreach ($sources as $x) {
- $sumw += $x['w'];
- if ($rands < $sumw) {
- $src = $x;
- break;
- }
- }
- if ($src['rsPos'] >= $src['rsSize']) {
- $nbFailed++;
- continue;
- }
- $res = $src['resultSet'][$src['rsPos']++];
- if (in_array($res['eid'], $cloud)) {
- $nbFailed++;
- continue;
+ while ($i < $cloudSize && $nbFailed < 5*$cloudSize) {
+ // On choisit une source aléatoire en tennant compte des poids.
+ $rands = rand(1,$sumWeights);
+ $sumw = 0;
+ $src = $sources['rand'];
+ foreach ($sources as $x) {
+ $sumw += $x['w'];
+ if ($rands < $sumw) {
+ $src = $x;
+ break;
+ }
+ }
+ if ($src['rsPos'] >= $src['rsSize']) {
+ $nbFailed++;
+ continue;
}
- // position dans le nuage, difficulté, eid, probaR1, probaR2
- $cloud[$i] = array('pos'=>$i++, 'd'=>$src['d'], 'eid'=>$res['eid'], 'probaR1'=>$res['r1'], 'probaR2'=>$res['r2']);
+ $res = $src['resultSet'][$src['rsPos']++];
+ if (in_array($res['eid'], $cloud)) {
+ $nbFailed++;
+ continue;
+ }
+ // position dans le nuage, difficulté, eid, probaR1, probaR2
+ $cloud[$i] = array('pos'=>$i++, 'd'=>$src['d'], 'eid'=>$res['eid'], 'probaR1'=>$res['r1'], 'probaR2'=>$res['r2']);
}
while ($i < $cloudSize) {
$cloud[$i] = array('pos'=>$i++, 'd'=>$sources['rand']['d'], 'eid'=>random_node(), 'probaR1'=>$sources['rand']['resultSet'][0]['r1'], 'probaR2'=>$sources['rand']['resultSet'][0]['r2']);
- }
- return $cloud;
+ }
+ return $cloud;
}
function cg_insert($centerEid, $cloud, $r1, $r2) {
- $db->exec("begin transaction;");
- $db->exec("insert into game(gid, eid_central_word, relation_1, relation_2) values (null, $centerEid, $r1, $r2);");
- $gid = $db->lastInsertRowID();
- foreach ($cloud as $c) {
- $db->exec("insert into game_cloud(gid, num, difficulty, probaR1, probaR2, eid_word) values($gid, ".$c['pos'].", ".$c['d'].", ".$c['probaR1'].', '.$c['probaR2'].', '.$c['eid'].");");
- }
- // TODO : insert into game_played une partie de référence.
+ $db->exec("begin transaction;");
+ $db->exec("insert into game(gid, eid_central_word, relation_1, relation_2) values (null, $centerEid, $r1, $r2);");
+ $gid = $db->lastInsertRowID();
+ foreach ($cloud as $c) {
+ $db->exec("insert into game_cloud(gid, num, difficulty, probaR1, probaR2, eid_word) values($gid, ".$c['pos'].", ".$c['d'].", ".$c['probaR1'].', '.$c['probaR2'].', '.$c['eid'].");");
+ }
+ // TODO : insert into game_played une partie de référence.
$db->exec("commit;");
-}
-
-function create_game($cloudSize) {
- global $db;
- // select random node
- $centerEid = random_node();
- $r1 = cg_choose_relations(); $r2 = $r1[1]; $r1 = $r1[0];
- $sources = cg_build_result_sets($cloudSize, $centerEid, $r1, $r2); $sumWeights = $sources[1]; $sources = $sources[0];
+}
+
+function create_game($cloudSize) {
+ global $db;
+ // select random node
+ $centerEid = random_node();
+ $r1 = cg_choose_relations(); $r2 = $r1[1]; $r1 = $r1[0];
+ $sources = cg_build_result_sets($cloudSize, $centerEid, $r1, $r2); $sumWeights = $sources[1]; $sources = $sources[0];
$cloud = cg_build_cloud($cloudSize, $sources, $sumWeights);
- cg_insert($centerEid, $cloud);
-
- var_dump($cloud);
- exit;}
-
-create_game(10);
-echo 'ok';
-
-// // Sinon tout est bon on effectu l'opération correspondant à la commande passée.
-// if($action == 0) // "Get partie"
-// {
-// // Requête sql de création de partie.
-// $req = "...";
-
-// $sql = sqlConnect();
-// $resp = mysql_query($req);
-
-// if(mysql_num_rows($resp) == 0)
-// echo mysql_error();
-// else
-// {
-// $sequence = "...";
-// echo $sequence;
-// }
-
-// mysql_close($sql);
-// }
-// else if($action == 1) // "Set partie"
-// {
-// // Requête sql d'ajout d'informations (et calcul de résultat).
-// $req = "...";
-
-// $sql = sqlConnect();
-// $resp = mysql_query($req);
-
-// if(mysql_num_rows($resp) == 0)
-// echo mysql_error();
-// else
-// {
-// $sequence = "...";
-// echo $sequence;
-// }
-
-// mysql_close($sql);
-// }
-// else if($action == 2)
-// {
-
-// }
-// else if($action == 3)
-// {
-
-// }
-// else if($action == 4)
-// {
-
-// }
-// else
-// die("Commande inconnue");
-
+ cg_insert($centerEid, $cloud);
+
+ var_dump($cloud);
+ exit;}
+
+create_game(10);
+echo 'ok';
+
+// // Sinon tout est bon on effectu l'opération correspondant à la commande passée.
+// if($action == 0) // "Get partie"
+// {
+// // Requête sql de création de partie.
+// $req = "...";
+
+// $sql = sqlConnect();
+// $resp = mysql_query($req);
+
+// if(mysql_num_rows($resp) == 0)
+// echo mysql_error();
+// else
+// {
+// $sequence = "...";
+// echo $sequence;
+// }
+
+// mysql_close($sql);
+// }
+// else if($action == 1) // "Set partie"
+// {
+// // Requête sql d'ajout d'informations (et calcul de résultat).
+// $req = "...";
+
+// $sql = sqlConnect();
+// $resp = mysql_query($req);
+
+// if(mysql_num_rows($resp) == 0)
+// echo mysql_error();
+// else
+// {
+// $sequence = "...";
+// echo $sequence;
+// }
+
+// mysql_close($sql);
+// }
+// else if($action == 2)
+// {
+
+// }
+// else if($action == 3)
+// {
+
+// }
+// else if($action == 4)
+// {
+
+// }
+// else
+// die("Commande inconnue");
+
?>
diff --git a/organisation/notes b/organisation/notes
@@ -1,3 +1,3 @@
- Une classe Constante pour toutes les constantes ("symboles" pour les paramètres, ...).
- Boutons pour les différents modes de jeu directement sur la "page de garde".
-- Créer un splash au démarrage.
+- Icônes : http://developer.android.com/guide/practices/ui_guidelines/icon_design.html
