Added all features in PZ

Author: RCNRC

.eslintcache

@@ -13,9 +13,9 @@ import {WritableAdapter} from "graphlabs.core.visualizer";
 
 import { /*Component,*/ SFC} from 'react';
 import { init1, graphModel1, init2, graphModel2, initres, /*graphModelres,*/ init, graphModel } from './ForMyGraphModel';
-import {message_0, message_0_changing, num_0, num_0_changing, message_1, message_1_changing} from './ForMeVars';
-import { GetNewRandomGraph, GetNewRandomGraphForThatOne, ChooseTask } from './Ops';
-import { CheckingAnswer } from "./CheckAnswer";
+import {message_0, message_0_changing, num_0, num_0_changing, message_1, message_1_changing, mark_0, mark_0_changing, T_s, T_s_changing, T_s_shawing} from './ForMeVars';
+import { ChooseTask } from './Ops';
+import { CheckingAnswer, StartDifficult, LastCheckingAnswer } from "./CheckAnswer";
 import { GraphsInit } from "./GraphsInit"
 
 class App extends Template {
@@ -25,7 +25,11 @@ class App extends Template {
     };
 
     componentWillMount() {
+        StartDifficult();
+        mark_0_changing(0);
         GraphsInit();
+        let timerId = setInterval(()=>{T_s_changing(T_s-1);this.forceUpdate();}, 1000);
+        window.setTimeout(()=>{clearInterval(timerId);LastCheckingAnswer();},1000*45*60);
     }
 
     /*public constructor(props: {}) { // не совсем понимаю, почему овервайт этих функций происходит автоматически и без конструктора
@@ -80,25 +84,37 @@ class App extends Template {
         Toolbar.prototype.getButtonList = () => {
             function beforeComplete(this: App):  Promise<{ success: boolean; fee: number }> {
                 return new Promise((resolve => {
-                    resolve(CheckingAnswer());
+                    resolve(LastCheckingAnswer());
                 }));
             }
             ToolButtonList.prototype.beforeComplete = beforeComplete.bind(this);
             ToolButtonList.prototype.help = () => `В данном задании вы должны построить результат операции, указанной в задании в правой части экрана. Для этого вы можете добавлять любое число вершин/рёбер. Также вы можете удалять любое число вершин, не инцидентных ни одному ребру или рёбер. Оценка зависит только от того, правильно ли вы построите граф.`;
 
             ToolButtonList.prototype.toolButtons = {
                 "http://gl-backend.svtz.ru:5000/odata/downloadImage(name='add_vertex.png')": () => {
+                    const start = new Date().getTime();
                     adapter.addVertex();
+                    const end = new Date().getTime();
+                    T_s_changing(T_s - Math.round((end-start)/1000));
                 },
                 "http://gl-backend.svtz.ru:5000/odata/downloadImage(name='add_edge.png')": () => { //  Меняю имя всем рёбрам на адекватные - ужасный костыль
+                    const start = new Date().getTime();
                     adapter.addEdge();
                     graphModel.edges.forEach((e:IEdge, i=0)=>{e.name = `${i++}`;});
+                    const end = new Date().getTime();
+                    T_s_changing(T_s - Math.round((end-start)/1000));
                 },
                 "http://gl-backend.svtz.ru:5000/odata/downloadImage(name='remove_vertex.png')": () => { //  Меняю имя всем рёбрам на адекватные - ужасный костыль
+                    const start = new Date().getTime();
                     adapter.removeVertex();
+                    const end = new Date().getTime();
+                    T_s_changing(T_s - Math.round((end-start)/1000));
                 },
                 "http://gl-backend.svtz.ru:5000/odata/downloadImage(name='remove_edge.png')": () => { //  Меняю имя всем рёбрам на адекватные - ужасный костыль
+                    const start = new Date().getTime();
                     adapter.removeEdge();
+                    const end = new Date().getTime();
+                    T_s_changing(T_s - Math.round((end-start)/1000));
                 }
             };
             return ToolButtonList;
@@ -110,14 +126,16 @@ class App extends Template {
                     <div>Панель инструментов</div>
                     <Buttons/>
                     <button type={"button"} style={{border: '1px double black', background: 'white', margin: '4px'}} onClick={()=>{
+                        CheckingAnswer();
                         num_0_changing(num_0+1);
                         GraphsInit();
                         this.forceUpdate();
                         if (num_0 === 7){  // удалить кнопку было бы хорошо
-                            message_1_changing("Операций больше нет");
+                            message_1_changing("Завершите выполнение теста.");
                             this.disable();
                         }
                     }}>{message_1}</button>
+                    <div>Time left: {T_s_shawing()}</div>
                 </div>);
         }
         return Toolbar;
@@ -165,7 +183,7 @@ class App extends Template {
                 </p>
                 <div>
                     <p>
-                        {num_0!==6?"1.":''}<GraphVisualizer
+                        {num_0!==1?"1.":''}<GraphVisualizer
                             graph={graphModel1}
                             adapterType={'readable'}
                             namedEdges={false}
@@ -174,7 +192,7 @@ class App extends Template {
                             edgeNaming={false}
                             incidentEdges={false}
                         />
-                        {num_0!==6?"2.":''}<GraphVisualizer
+                        {num_0!==1?"2.":''}<GraphVisualizer
                             graph={graphModel2}
                             adapterType={'readable'}
                             namedEdges={false}

src/App.tsx

@@ -1,6 +1,15 @@
 import {graphModel, graphModelres} from "./ForMyGraphModel";
 import { IVertex } from 'graphlabs.core.graphs';
 import { store } from 'graphlabs.core.template';
+import {message_0, message_0_changing, num_0, num_0_changing, message_1, message_1_changing, mark_0, mark_0_changing, k_s, k_s_changing} from './ForMeVars';
+
+function LastCheckingAnswer(){
+    mark_0_changing(Math.round(mark_0*100/(8*9+k_s[0]+k_s[1]+k_s[2]+k_s[3]+k_s[4]+k_s[5]+k_s[6]+k_s[7])));
+    window.alert(`Вы вполнили задания на оценку: ${mark_0}`);
+    //window.alert(`k_s: ${k_s}`);
+    store.getState().notifier.score = mark_0; // здесь я меняю оценку.
+    return Promise.resolve({success: mark_0 === 100, fee: mark_0});
+}
 
 function CheckingAnswer(){// мое добавление для проверки оценки: процент одинаковости
     let markN = 100;
@@ -42,46 +51,57 @@ function CheckingAnswer(){// мое добавление для проверки
         markN = 0;
     }
 
-    /*let num = 0;
-    graphModelres.edges.forEach((e:any)=>{ // проверка на совпадения рёбер
-        graphModel.edges.forEach(eN=>{
-            if(e.name==eN.name)
-                //markN+=50/(graphModelres.edges.length);
-                num++;
-        });
-    });
-    if(num != graphModelres.edges.length ){
-        markN = 0;
-    }
-    num = 0;
-    graphModel.edges.forEach(e=>{ // проверка на лишние рёбра
-        //markN-=50/(graphModelres.edges.length);
-        graphModelres.edges.forEach(eN=>{
-            if(e.name==eN.name) {
-                //markN += 50 / (graphModelres.edges.length);
-                num++;
-            }
-        });
-        if(num == 0 ){
-            markN = 0;
-        }
-        num = 0;
-    });*/
-
     if(markN===100){
         window.alert(`Вы верно выполнили задание`);
-        markN=100;
+        mark_0_changing(mark_0+9+k_s[num_0]);
     }
 
     if(markN<100){
         window.alert(`Вы неверно выполнили задание`);
-        markN=0;
     }
+}
 
-    //markN=Math.round(markN);
-    //console.log(`mark is ${markN}`);
-    store.getState().notifier.score = markN; // здесь я меняю оценку.
-    return Promise.resolve({success: markN === 100, fee: markN});
+function StartDifficult(){
+    let new_k_s = [0,0,0,0,0,0,0,0];
+    let all_num = 0;
+    for (let i=0; i<8; i++){
+        new_k_s = k_s;
+        new_k_s[i]+=Math.round(Math.random()*99+1);
+        all_num+=new_k_s[i];
+    }
+    let true_num=0;
+    for (let i=0; i<8; i++){
+        new_k_s[i]=Math.round(39*new_k_s[i]/all_num);
+        true_num+=new_k_s[i];
+    }
+    let max_0=0;
+    let min_0=0;
+    let schetchick=true;
+    while (true_num !==39){
+        if(true_num>39){
+            max_0 = Math.max(new_k_s[0], new_k_s[1], new_k_s[2], new_k_s[3], new_k_s[4], new_k_s[5], new_k_s[6], new_k_s[7]);
+            for (let i=0; i<8; i++){
+                if (schetchick && max_0 === new_k_s[i]){
+                    new_k_s[i]--;
+                    true_num--;
+                    schetchick = false;
+                }
+            }
+            schetchick = true;
+        }
+        else{
+            min_0 = Math.min(new_k_s[0], new_k_s[1], new_k_s[2], new_k_s[3], new_k_s[4], new_k_s[5], new_k_s[6], new_k_s[7]);
+            for (let i=0; i<8; i++){
+                if (schetchick && min_0 === new_k_s[i]){
+                    new_k_s[i]++;
+                    true_num++;
+                    schetchick = false;
+                }
+            }
+            schetchick = true;
+        }
+    }
+    k_s_changing(new_k_s);
 }
 
-export {CheckingAnswer};
+export {CheckingAnswer, StartDifficult, LastCheckingAnswer};

src/CheckAnswer.ts

@@ -1,9 +1,21 @@
 let message_0 = '';
 let message_1 = "Следующая операция";// костылим на первое время
 let num_0 = 0;
+let mark_0 = 0;
+let k_s = [0,0,0,0,0,0,0,0];
+let T_s = 45*60;
 
-function num_0_changing (new_num: number) {num_0 = new_num;}
 function message_0_changing (new_message: string) {message_0 = new_message;}
 function message_1_changing (new_message: string) {message_1 = new_message;}
+function num_0_changing (new_num: number) {num_0 = new_num;}
+function mark_0_changing (new_mark: number) {mark_0 = new_mark;}
+function k_s_changing (new_k_s: number[]) {k_s = new_k_s;}
+function T_s_changing (new_T_s: number) {T_s = new_T_s;}
+function T_s_shawing () {
+    let T_min, T_sec;
+    T_sec = T_s%60;
+    T_min = (T_s - T_sec)/60;
+    return `${T_min}min ${T_sec}sec`;
+}
 
-export { num_0, message_0, num_0_changing, message_0_changing, message_1, message_1_changing };
+export { num_0, message_0, num_0_changing, message_0_changing, message_1, message_1_changing, mark_0, mark_0_changing, k_s, k_s_changing, T_s, T_s_changing, T_s_shawing };

src/ForMeVars.ts

@@ -1,23 +1,76 @@
 import {init, init1, init2, initres} from "./ForMyGraphModel";
-import {GraphGenerator, IEdge, IGraph, IVertex} from 'graphlabs.core.graphs';
-import {ChooseTask, GetNewRandomGraph, GetNewRandomGraphForThatOne} from "./Ops";
+import {Edge, GraphGenerator, IEdge, IGraph, IVertex, Vertex} from 'graphlabs.core.graphs';
+import {ChooseTask} from "./Ops";
+import {message_0, message_0_changing, num_0, num_0_changing, message_1, message_1_changing, mark_0, mark_0_changing, k_s, k_s_changing} from './ForMeVars';
 
 function GraphsInit(){
     let graph: IGraph<IVertex, IEdge>;
+    let num_vert_plus_edg = num_0<=4?(9+k_s[num_0]):(Math.round((9+k_s[num_0])/2));
 
     graph = GraphGenerator.generate(0);
     init(graph);
 
     let graph1: IGraph<IVertex, IEdge>;
-    graph1 = GetNewRandomGraph(5);
+    graph1 = GetNewRandomGraph(num_vert_plus_edg);
     init1(graph1);
 
     let graph2: IGraph<IVertex, IEdge>;
-    graph2 = GetNewRandomGraphForThatOne(5,graph1);
+    graph2 = num_0<=2?GetNewRandomGraph(num_vert_plus_edg):GetNewRandomGraphForThatOne(num_vert_plus_edg, graph1);
     init2(graph2);
 
     let graphres = ChooseTask();
     initres(graphres);
 }
 
+function GetNewRandomGraph (num:number){ // рандомный граф
+    let graph: IGraph<IVertex, IEdge>;
+    graph = GraphGenerator.generate(0);
+    let edge_num = num - Math.round(num/2);//Math.round((Math.random()*0.15+0.85)*num/2);
+    let vert_num = num - edge_num;
+    let vert_num_help = vert_num;
+
+    while (vert_num!==0){
+        graph.addVertex(new Vertex(`${vert_num}`));
+        vert_num--;
+    }
+
+    while (edge_num!==0){
+        let v1 = graph.getVertex(`${Math.round(Math.random()*(vert_num_help-1)+1)}`)[0];
+        let v2 = graph.getVertex(`${Math.round(Math.random()*(vert_num_help-1)+1)}`)[0];
+        if(!v1.isAdjacent(graph,v2)){
+            graph.addEdge(new Edge(v1,v2,`${v1.name}+${v2.name}`));
+            edge_num--;
+        }
+    }
+
+    return graph;
+}
+
+function GetNewRandomGraphForThatOne (num:number, graph1:IGraph<IVertex, IEdge>){
+    let graph: IGraph<IVertex, IEdge>;
+    graph = GraphGenerator.generate(0);
+    let edge_num = num - Math.round(num/2);//Math.round((Math.random()*0.15+0.85)*num/2);
+    let vert_num = num - edge_num;
+
+    vert_num+=graph1.vertices.length;
+    edge_num+=graph1.edges.length;
+    let vert_num_help = vert_num;
+
+    while (vert_num!==graph1.vertices.length){
+        graph.addVertex(new Vertex(`${vert_num}`));
+        vert_num--;
+    }
+
+    while (edge_num!==0){
+        let v1 = graph.getVertex(`${Math.round(Math.random()*(vert_num_help-1)+graph1.vertices.length)}`)[0];
+        let v2 = graph.getVertex(`${Math.round(Math.random()*(vert_num_help-1)+graph1.vertices.length)}`)[0];
+        if(v1 && v2 && !v1.isAdjacent(graph,v2)){
+            graph.addEdge(new Edge(v1,v2,`${v1.name}+${v2.name}`));
+            edge_num--;
+        }
+    }
+
+    return graph;
+}
+
 export {GraphsInit};