Merge branch 'master' of https://codefirst.iut.uca.fr/git/Crypteam/Cryptid into InterfaceBranche

cryptide_project/src/Components/GraphContainer.tsx

@@ -1,41 +1,26 @@
 import React, { useEffect } from "react";
 import { DataSet, Network} from "vis-network/standalone/esm/vis-network";
-import EdgesCreator from "../source/EdgesCreator";
-import GraphCreator from "../source/Graph/GraphCreator";
-import IndiceChooser from "../source/IndiceChooser";
-import SportIndice from "../source/Indices/SportIndice";
-import NetworkGenerator from "../source/NetworkGenerator";
-import Sport from "../source/Sport";
-import Stub from "../source/Stub";
+import EdgesCreator from "../model/EdgesCreator";
+import GraphCreator from "../model/Graph/GraphCreator";
+import IndiceChooser from "../model/IndiceChooser";
+import SportIndice from "../model/Indices/SportIndice";
+import NetworkGenerator from "../model/NetworkGenerator";
+import Sport from "../model/Sport";
+import Stub from "../model/Stub";
 import "./GraphContainer.css";
-import NodePerson from "../source/Graph/NodePerson";
-import IndiceTesterFactory from "../source/Factory/IndiceTesterFactory";
+import NodePerson from "../model/Graph/NodePerson";
+import IndiceTesterFactory from "../model/Factory/IndiceTesterFactory";
+import GameCreator from "../model/GameCreator";
 
-const edgesCreator = new EdgesCreator()
+const [networkPerson, choosenPerson, choosenIndices, graph] = GameCreator.CreateGame(3, 30)
 
-const chooser = new IndiceChooser()
 
-const indices = Stub.GenerateIndice()
-
-const networkPerson = NetworkGenerator.GenerateNetwork(50)
-
-const rand = Math.floor(Math.random() * 50)
-const person = networkPerson.getPersons()[rand]
-
-const choosenIndices = chooser.chooseIndice(networkPerson, person, indices, 8)
-
-edgesCreator.CreateAllEdges(networkPerson, person, choosenIndices)
-
-const graph = GraphCreator.CreateGraph(networkPerson)
-
-
-let indice = new SportIndice(12, [Sport.TENNIS, Sport.BASEBALL])
 console.log(networkPerson)
 console.log(graph)
 choosenIndices.forEach((indice) =>{
   console.log(indice.ToString("fr"))
 });
-console.log(person)
+console.log(choosenPerson)
 const testIndice = choosenIndices[0]
 
 interface MyGraphComponentProps {

cryptide_project/src/model/GameCreator.ts

@@ -0,0 +1,36 @@
+import { TupleType } from "typescript";
+import EdgesCreator from "./EdgesCreator";
+import GraphCreator from "./Graph/GraphCreator";
+import GraphPerson from "./Graph/GraphPerson";
+import IndiceChooser from "./IndiceChooser";
+import Indice from "./Indices/Indice";
+import NetworkGenerator from "./NetworkGenerator";
+import Person from "./Person";
+import PersonNetwork from "./PersonsNetwork";
+import Stub from "./Stub";
+
+class GameCreator{
+    static CreateGame(nbPlayers: number, nbNodes: number): [PersonNetwork, Person, Indice[], GraphPerson]{
+        const edgesCreator = new EdgesCreator()
+
+        const chooser = new IndiceChooser()
+
+        const indices = Stub.GenerateIndice()
+
+        const networkPerson = NetworkGenerator.GenerateNetwork(nbNodes)
+
+        const rand = Math.floor(Math.random() * nbNodes)
+        const person = networkPerson.getPersons()[rand]
+
+        const choosenIndices = chooser.chooseIndice(person, indices, nbPlayers)
+
+        edgesCreator.CreateAllEdges(networkPerson, person, choosenIndices)
+
+        const graph = GraphCreator.CreateGraph(networkPerson)
+
+        return [networkPerson, person, choosenIndices, graph]
+
+    }
+}
+
+export default GameCreator

cryptide_project/src/model/IndiceChooser.ts

@@ -13,7 +13,7 @@ import NbSportIndice from "./Indices/NbSportIndice";
 
 class IndiceChooser{
 
-    chooseIndice(personNetwork: PersonNetwork, choosenPerson: Person, indices: Indice[], nbPlayer: number): Indice[]{
+    chooseIndice(choosenPerson: Person, indices: Indice[], nbPlayer: number): Indice[]{
         const choosenIndices: Indice[] = []
         const ageIndice : Indice[] = []
         const sportIndice : Indice[] = []

cryptide_project/src/model/IndiceTester/ColorIndiceEdgesTester.ts

@@ -22,15 +22,6 @@ class ColorEdgesIndiceTester implements IndiceTester{
         });
         return res
     }
-
-    TestWorks(person: Person): boolean {
-        person.getFriends().forEach(p => {
-            if(this.colorEdgesIndice.getColors().includes(p.getColor())){
-                return true
-            }
-        });
-        return false
-    }
 }
 
 export default ColorEdgesIndiceTester

cryptide_project/src/model/IndiceTester/ColorIndiceTester.ts

@@ -14,10 +14,6 @@ class ColorIndiceTester implements IndiceTester{
     Works(person: Person): boolean {
         return this.colorIndice.getColors().includes(person.getColor()) 
     }
-
-    TestWorks(person: Person): boolean {
-        return this.colorIndice.getColors().includes(person.getColor()) 
-    }
 }
 
 export default ColorIndiceTester

cryptide_project/src/model/IndiceTester/IndiceTester.ts

@@ -4,7 +4,6 @@ import Person from "../Person"
 interface IndiceTester{
 
     Works(person: Person): boolean
-    TestWorks(person: Person): boolean
 }
 
 export default IndiceTester

cryptide_project/src/model/IndiceTester/IndiceTesterAge.ts

@@ -13,10 +13,6 @@ class IndiceTesterAge implements IndiceTester{
     Works(person: Person): boolean {
         return person.getAge() >= this.ageIndice.getMinimum() && person.getAge()<= this.ageIndice.getMaximum()
     }
-
-    TestWorks(person: Person): boolean {
-        return person.getAge() >= this.ageIndice.getMinimum() && person.getAge()<this.ageIndice.getMaximum()
-    }
 }
 
 export default IndiceTesterAge

cryptide_project/src/model/IndiceTester/NbEdgesIndiceTester.ts

@@ -14,10 +14,6 @@ class NbEdgesIndiceTester implements IndiceTester{
     Works(person: Person): boolean {
         return person.getFriends().length >= this.nbEdgesIndice.getNbEdges()
     }
-
-    TestWorks(person: Person): boolean {
-        return true
-    }
 }
 
 export default NbEdgesIndiceTester

cryptide_project/src/model/IndiceTester/NbSportIndiceTester.ts

@@ -15,10 +15,6 @@ class NbSportIndiceTester implements IndiceTester{
     Works(person: Person): boolean {
         return this.nbSportIndice.getNbSport() ==  person.getSports().length
     }
-
-    TestWorks(person: Person): boolean {
-        return this.nbSportIndice.getNbSport() ==  person.getSports().length
-    }
 }
 
 export default NbSportIndiceTester

cryptide_project/src/model/IndiceTester/SportIndiceTester.ts

@@ -20,15 +20,6 @@ class SportIndiceTester implements IndiceTester{
         }
         return false
     }
-
-    TestWorks(person: Person): boolean {
-        for (const sport of person.getSports()){
-            if (this.sportIndice.getSports().includes(sport)){
-                return true
-            }
-        }
-        return false
-    }
 }
 
 export default SportIndiceTester