This commit is contained in:
Lorenzo Iovino 2019-09-11 16:04:45 +02:00
parent ae477fc3df
commit 0109aab0f5
15 changed files with 918 additions and 586 deletions

303
.idea/workspace.xml generated
View file

@ -4,18 +4,14 @@
<bookmark url="file://$PROJECT_DIR$/DataGatherer/src/index.html" line="11" />
</component>
<component name="ChangeListManager">
<list default="true" id="603d916b-6d0f-43a7-809c-21ce2bcb2533" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/models/Data.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<list default="true" id="603d916b-6d0f-43a7-809c-21ce2bcb2533" name="Default Changelist" comment="Feat: scaled">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DataGeneratorPuppets/src/Puppet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/DataGeneratorPuppets/src/Puppet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/DataGeneratorPuppets/src/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/DataGeneratorPuppets/src/main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/Predictor.py" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/Predictor.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/weights/first_try.h5" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/weights/first_try2.h5" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorWebService/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorWebService/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/ImageCreatorService.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/ImageCreatorService.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/PredictorWebService.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/PredictorWebService.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/main.ts" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@ -31,11 +27,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/main.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="187">
<caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
@ -43,23 +39,23 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/DataGatherer/src/sender/Sender.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="15" lean-forward="true" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
<state relative-caret-position="459">
<caret line="30" column="48" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
<folding>
<element signature="e#0#48#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/ImageCreatorService.ts">
<entry file="file://$PROJECT_DIR$/DataGatherer/src/shared/Data.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-391">
<caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<folding>
<element signature="e#0#62#0" expanded="true" />
</folding>
<state relative-caret-position="153">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</provider>
</entry>
@ -67,26 +63,26 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/Puppet.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" selection-start-line="7" selection-end-line="7" />
<state relative-caret-position="714">
<caret line="42" column="13" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/main.ts">
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/event-flow/MouseEventFlow.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" />
<state relative-caret-position="153">
<caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/main.ts">
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/datas/flow.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="49" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="49" />
<state relative-caret-position="187">
<caret line="11" column="11" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
</state>
</provider>
</entry>
@ -94,17 +90,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="36" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/DataGatherer/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" selection-start-line="23" selection-end-line="23" />
<state relative-caret-position="204">
<caret line="12" column="24" lean-forward="true" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
</state>
</provider>
</entry>
@ -112,11 +99,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/models/Data.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<state relative-caret-position="102">
<caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
<folding>
<element signature="e#0#37#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -124,7 +108,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/DataGatherer/src/source/mouse/Mouse.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<state relative-caret-position="68">
<caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
<folding>
<element signature="e#0#35#0" expanded="true" />
@ -137,7 +121,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>CanvasRenderer</find>
<find>stroke</find>
<find>window</find>
<find>req</find>
@ -161,11 +144,13 @@
<find>docum</find>
<find>.style</find>
<find>new Data</find>
<find>flowName</find>
<find>atetime</find>
<find>connect</find>
<find>console</find>
<find>constructor</find>
<find>canvas</find>
<find>flowName</find>
<find>DataSchema</find>
</findStrings>
<replaceStrings>
<replace />
@ -179,7 +164,6 @@
<list>
<option value="$PROJECT_DIR$/great-big-angular2-example/README.md" />
<option value="$PROJECT_DIR$/great-big-angular2-example/src/index.html" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/package.json" />
<option value="$PROJECT_DIR$/DataGatherer/src/data/Data.ts" />
<option value="$PROJECT_DIR$/DataGatherer/src/source/generator/Generator.ts" />
<option value="$PROJECT_DIR$/DataGatherer/src/shared/Flow.ts" />
@ -202,21 +186,22 @@
<option value="$PROJECT_DIR$/DataGatherer/src/main.ts" />
<option value="$PROJECT_DIR$/DataGatherer/src/sender/Sender.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/main.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/models/Data.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/PredictorWebService.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/main.ts" />
<option value="$PROJECT_DIR$/DataGeneratorPuppets/src/Puppet.ts" />
<option value="$PROJECT_DIR$/DataGeneratorPuppets/src/main.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/ImageCreatorService.ts" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/ImageCreatorService.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/models/Data.ts" />
<option value="$PROJECT_DIR$/DataGeneratorPuppets/src/main.ts" />
<option value="$PROJECT_DIR$/Predictor/PredictorWebService/package.json" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1981" />
<option name="y" value="-310" />
<option name="width" value="1936" />
<option name="height" value="1160" />
<option name="x" value="-674" />
<option name="y" value="-12" />
<option name="width" value="2998" />
<option name="height" value="1599" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@ -310,6 +295,12 @@
<item name="UserflowPredictorSystem" type="462c0819:PsiDirectoryNode" />
<item name="Predictor" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="UserflowPredictorSystem" type="b2602c69:ProjectViewProjectNode" />
<item name="UserflowPredictorSystem" type="462c0819:PsiDirectoryNode" />
<item name="Predictor" type="462c0819:PsiDirectoryNode" />
<item name="PredictorNeuralNetwork" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="UserflowPredictorSystem" type="b2602c69:ProjectViewProjectNode" />
<item name="UserflowPredictorSystem" type="462c0819:PsiDirectoryNode" />
@ -353,7 +344,7 @@
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="ts.external.directory.path" value="C:\Users\Lorenzo\UserflowPredictorSystem\DataGatherer\node_modules\typescript\lib" />
<property name="ts.external.directory.path" value="C:\Users\Lorenzo\UserflowPredictorSystem\DataGeneratorPuppets\node_modules\typescript\lib" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@ -460,7 +451,12 @@
<workItem from="1556285810803" duration="12320000" />
<workItem from="1556523841979" duration="654000" />
<workItem from="1556826362124" duration="2509000" />
<workItem from="1556828935019" duration="10937000" />
<workItem from="1556828935019" duration="11044000" />
<workItem from="1556866408789" duration="605000" />
<workItem from="1563784521359" duration="1751000" />
<workItem from="1563870811276" duration="315000" />
<workItem from="1563972735642" duration="2206000" />
<workItem from="1564047438948" duration="1281000" />
</task>
<task id="LOCAL-00001" summary="Feat: Added websocket comm. for DataGatherer and PredictorWebService">
<created>1554992034761</created>
@ -473,18 +469,18 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="85601000" />
<option name="totallyTimeSpent" value="91866000" />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-318" width="1936" height="1176" extended-state="6" />
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49818182" visible="true" weight="0.19125395" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49818182" visible="true" weight="0.26966292" />
<window_info id="Structure" order="1" sideWeight="0.5018182" side_tool="true" weight="0.19125395" />
<window_info id="Favorites" order="2" sideWeight="0.50060606" side_tool="true" weight="0.24868283" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.36049855" />
<window_info anchor="bottom" id="Run" order="2" weight="0.36049855" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@ -527,13 +523,7 @@
<entry file="file://$PROJECT_DIR$/great-big-angular2-example/src/index.html" />
<entry file="file://$PROJECT_DIR$/great-big-angular2-example/README.md" />
<entry file="file://$PROJECT_DIR$/great-big-angular2-example/package.json" />
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/node_modules/canvas/types/index.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="224" column="13" selection-start-line="224" selection-start-column="13" selection-end-line="224" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/node_modules/canvas/types/index.d.ts" />
<entry file="file://$PROJECT_DIR$/DataGatherer/node_modules/typescript/lib/lib.dom.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
@ -583,12 +573,8 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/datas/train/cat/cat.440.jpg">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/datas/train/cat/cat.445.jpg">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/datas/train/cat/cat.440.jpg" />
<entry file="file://$PROJECT_DIR$/Predictor/PredictorNeuralNetwork/datas/train/cat/cat.445.jpg" />
<entry file="file://$PROJECT_DIR$/DataGatherer/src/gatherer/Gatherer.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
@ -596,13 +582,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/event-flow/MouseEventFlow.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/source/keyboard/Keyboard.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
@ -642,13 +621,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/datas/flow.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/source/Source.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
@ -673,13 +645,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/shared/Data.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/node_modules/@types/node/globals.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
@ -687,26 +652,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/sender/Sender.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="30" column="48" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
<folding>
<element signature="e#0#48#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/source/mouse/Mouse.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/dist/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
@ -714,23 +659,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/models/Data.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
<folding>
<element signature="e#0#37#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/PredictorWebService.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
@ -741,13 +669,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="36" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
@ -755,17 +676,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/main.ts">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="49" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/Puppet.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" selection-start-line="7" selection-end-line="7" />
<state relative-caret-position="68">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
@ -776,32 +690,101 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/main.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="49" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/image-creator/ImageCreatorService.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-391">
<caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<state relative-caret-position="1284">
<caret line="166" column="90" selection-start-line="166" selection-start-column="90" selection-end-line="166" selection-end-column="90" />
<folding>
<element signature="e#0#62#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/sender/Sender.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="30" column="48" selection-start-line="30" selection-start-column="48" selection-end-line="30" selection-end-column="48" />
<folding>
<element signature="e#0#48#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/shared/Data.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/Puppet.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="42" column="13" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/event-flow/MouseEventFlow.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/datas/flow.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="11" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/src/predictor-web-service/models/Data.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGatherer/src/source/mouse/Mouse.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="5" column="54" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Predictor/PredictorWebService/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" column="24" lean-forward="true" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/DataGeneratorPuppets/src/main.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
<state relative-caret-position="187">
<caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" column="15" lean-forward="true" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
</state>
</provider>
</entry>
</component>
</project>

View file

@ -3,12 +3,6 @@ import {flows} from "../../DataGeneratorPuppets/src/datas/flow";
function main() {
/*for(let i = 1; i <= 5; i++) {
let flowIndex = Math.floor(Math.random() * flows.length + 0);
const puppet = new Puppet('', flows[flowIndex].name, 'bot_'+i, flows[flowIndex].data);
puppet.run();
}*/
let puppetCounter = 0;
let loop = true;
let counter = 0;
@ -30,13 +24,6 @@ function main() {
});
}
}, 50)
/*
const puppet2 = new Puppet('', flows[flowIndex].name, 'bot_'+puppetCounter++, flows[flowIndex].data).run();
const puppet3 = new Puppet('', flows[flowIndex].name, 'bot_'+puppetCounter++, flows[flowIndex].data).run();
const puppet4 = new Puppet('', flows[flowIndex].name, 'bot_'+puppetCounter++, flows[flowIndex].data).run();
const puppet5 = new Puppet('', flows[flowIndex].name, 'bot_'+puppetCounter++, flows[flowIndex].data).run('infinite');*/
}
main();

View file

@ -8,15 +8,38 @@ import matplotlib.pyplot as plt
import matplotlib.image as mpimg
import cv2
import numpy as np
import os
import shutil
import random
img_width, img_height = 150, 150
train_data_dir = './UserflowPredictorSystem/predictor/datas/train'
validation_data_dir = './UserflowPredictorSystem/predictor/datas/test'
train_data_dir = './Predictor/PredictorNeuralNetwork/datas/userflows/train/'
validation_data_dir = './Predictor/PredictorNeuralNetwork/datas/userflows/test/'
nb_train_samples = 2000
nb_validation_samples = 800
epochs = 100
epochs = 20
batch_size = 16
def copytree(src, dst, symlinks=False, ignore=None):
for item in os.listdir(src):
s = os.path.join(src, item)
d = os.path.join(dst, item)
if os.path.isdir(s):
shutil.copytree(s, d, symlinks, ignore)
else:
shutil.copy2(s, d)
def populateDatas():
copytree('./Predictor/PredictorWebService/trainingImages/virtual', './Predictor/PredictorNeuralNetwork/datas/userflows/train')
offset = 0
for folder in os.listdir('./Predictor/PredictorNeuralNetwork/datas/userflows/train'):
numberOfFiles = len([name for name in os.listdir('./Predictor/PredictorNeuralNetwork/datas/userflows/train/' + folder)])
numberOfTestFiles = int(numberOfFiles / 10)
for idx in range(0,numberOfTestFiles):
file = os.listdir('./Predictor/PredictorNeuralNetwork/datas/userflows/train/' + folder)[random.randint(0,numberOfTestFiles)]
shutil.copy2("./Predictor/PredictorNeuralNetwork/datas/userflows/train/" + folder + "/" + file, './Predictor/PredictorNeuralNetwork/datas/userflows/test/' + str(idx + offset) + '.png')
shutil.copy2("./Predictor/PredictorNeuralNetwork/datas/userflows/train/" + folder + "/" + file, './Predictor/PredictorNeuralNetwork/datas/userflows/test/' + str(idx + offset) + '_SEPARATOR.png')
offset = numberOfTestFiles
if K.image_data_format() == 'channels_first':
input_shape = (3, img_width, img_height)
@ -45,7 +68,7 @@ def create_model():
model.add(Activation('sigmoid'))
model.compile(loss='binary_crossentropy',
model.compile(loss='categorical_crossentropy',
optimizer='rmsprop',
metrics=['accuracy'])
return model
@ -66,13 +89,13 @@ def train_model(model):
train_data_dir,
target_size=(img_width, img_height),
batch_size=batch_size,
class_mode='binary')
class_mode='categorical')
validation_generator = test_datagen.flow_from_directory(
validation_data_dir,
target_size=(img_width, img_height),
batch_size=batch_size,
class_mode='binary')
class_mode='categorical')
model.fit_generator(
train_generator,
@ -81,7 +104,7 @@ def train_model(model):
validation_data=validation_generator,
validation_steps=nb_validation_samples // batch_size)
model.save_weights('./UserflowPredictorSystem/first_try2.h5')
model.save_weights('./Predictor/PredictorNeuralNetwork/weights/userflows.h5')
return model
@ -93,29 +116,26 @@ def load_trained_model(weights_path):
def predict(number, model):
img = cv2.imread("./UserflowPredictorSystem/predictor/datas/test/" + str(number) + ".jpg")
im = mpimg.imread("./UserflowPredictorSystem/predictor/datas/test/" + str(number) + ".jpg")
img = cv2.imread("./Predictor/PredictorNeuralNetwork/datas/userflows/test/" + str(number) + ".png")
im = mpimg.imread("./Predictor/PredictorNeuralNetwork/datas/userflows/test/" + str(number) + ".png")
plt.imshow(im)
img = cv2.resize(img, (img_width,img_height))
img = img.reshape(1, img_width, img_height, 3)
res = model.predict(img)
if res == 1:
print('DOG')
else:
print('CAT')
print(res)
model = create_model()
populateDatas()
model = train_model(model)
import os
os.getcwd()
trained_model = load_trained_model("./UserflowPredictorSystem/first_try2.h5")
trained_model = load_trained_model("./Predictor/PredictorNeuralNetwork/weights/userflows.h5")
trained_model.summary()
import random
predict(random.randint(1,12500), trained_model)
predict('lolly', model)
num = random.randint(1,10)
print(num)
predict(num, trained_model)
print(np.argmax(loaded_model.predict(img)))
print(np.argmax(trained_model.predict(img)))

View file

@ -0,0 +1,119 @@
from keras.models import Sequential
from keras.layers import Activation, Dropout, Flatten, Dense
from keras import backend as K
from keras.preprocessing.sequence import pad_sequences
from keras.preprocessing.image import ImageDataGenerator
from keras.layers import Conv2D, MaxPooling2D
import matplotlib.pyplot as plt
import matplotlib.image as mpimg
import cv2
import numpy as np
img_width, img_height = 150, 150
train_data_dir = './Predictor/PredictorNeuralNetwork/datas/catVsDog/train/'
validation_data_dir = './Predictor/PredictorNeuralNetwork/datas/catVsDog/test/'
nb_train_samples = 2000
nb_validation_samples = 800
epochs = 100
batch_size = 16
if K.image_data_format() == 'channels_first':
input_shape = (3, img_width, img_height)
else:
input_shape = (img_width, img_height, 3)
def create_model():
model = Sequential()
model.add(Conv2D(32, (3, 3), input_shape=input_shape))
model.add(Activation('relu'))
model.add(MaxPooling2D(pool_size=(2, 2)))
model.add(Conv2D(32, (3, 3)))
model.add(Activation('relu'))
model.add(MaxPooling2D(pool_size=(2, 2)))
model.add(Conv2D(64, (3, 3)))
model.add(Activation('relu'))
model.add(MaxPooling2D(pool_size=(2, 2)))
model.add(Flatten())
model.add(Dense(64))
model.add(Activation('relu'))
model.add(Dropout(0.5))
model.add(Dense(1))
model.add(Activation('sigmoid'))
model.compile(loss='binary_crossentropy',
optimizer='rmsprop',
metrics=['accuracy'])
return model
def train_model(model):
# this is the augmentation configuration we will use for training
train_datagen = ImageDataGenerator(
rescale=1. / 255,
shear_range=0.2,
zoom_range=0.2,
horizontal_flip=True)
# this is the augmentation configuration we will use for testing:
# only rescaling
test_datagen = ImageDataGenerator(rescale=1. / 255)
train_generator = train_datagen.flow_from_directory(
train_data_dir,
target_size=(img_width, img_height),
batch_size=batch_size,
class_mode='binary')
validation_generator = test_datagen.flow_from_directory(
validation_data_dir,
target_size=(img_width, img_height),
batch_size=batch_size,
class_mode='binary')
model.fit_generator(
train_generator,
steps_per_epoch=nb_train_samples // batch_size,
epochs=epochs,
validation_data=validation_generator,
validation_steps=nb_validation_samples // batch_size)
model.save_weights('./Predictor/PredictorNeuralNetwork/weights/catVsDog2.h5')
return model
def load_trained_model(weights_path):
model = create_model()
model.load_weights(weights_path)
return model
def predict(number, model):
img = cv2.imread("./Predictor/PredictorNeuralNetwork/datas/catVsDog/test/" + str(number) + ".jpg")
im = mpimg.imread("./Predictor/PredictorNeuralNetwork/datas/catVsDog/test/" + str(number) + ".jpg")
plt.imshow(im)
img = cv2.resize(img, (img_width,img_height))
img = img.reshape(1, img_width, img_height, 3)
res = model.predict(img)
if res == 1:
print('DOG')
else:
print('CAT')
model = create_model()
model = train_model(model)
import os
os.getcwd()
trained_model = load_trained_model("./Predictor/PredictorNeuralNetwork/weights/catVsDog.h5")
trained_model.summary()
import random
predict(random.randint(1,12500), trained_model)
print(np.argmax(trained_model.predict(img)))

Binary file not shown.

View file

@ -0,0 +1,78 @@
# Do not edit. File was generated by node-gyp's "configure" step
{
"target_defaults": {
"cflags": [],
"default_configuration": "Release",
"defines": [],
"include_dirs": [],
"libraries": [],
"msbuild_toolset": "v141",
"msvs_windows_target_platform_version": "10.0.17763.0"
},
"variables": {
"asan": 0,
"build_v8_with_gn": "false",
"coverage": "false",
"debug_nghttp2": "false",
"enable_lto": "false",
"enable_pgo_generate": "false",
"enable_pgo_use": "false",
"force_dynamic_crt": 0,
"host_arch": "x64",
"icu_data_in": "..\\..\\deps/icu-small\\source/data/in\\icudt64l.dat",
"icu_endianness": "l",
"icu_gyp_path": "tools/icu/icu-generic.gyp",
"icu_locales": "en,root",
"icu_path": "deps/icu-small",
"icu_small": "true",
"icu_ver_major": "64",
"nasm_version": "2.14",
"node_byteorder": "little",
"node_code_cache_path": "yes",
"node_debug_lib": "false",
"node_enable_d8": "false",
"node_enable_v8_vtunejit": "false",
"node_install_npm": "true",
"node_module_version": 72,
"node_no_browser_globals": "false",
"node_prefix": "/usr/local",
"node_release_urlbase": "https://nodejs.org/download/release/",
"node_report": "true",
"node_shared": "false",
"node_shared_cares": "false",
"node_shared_http_parser": "false",
"node_shared_libuv": "false",
"node_shared_nghttp2": "false",
"node_shared_openssl": "false",
"node_shared_zlib": "false",
"node_tag": "",
"node_target_type": "executable",
"node_use_bundled_v8": "true",
"node_use_dtrace": "false",
"node_use_etw": "true",
"node_use_large_pages": "false",
"node_use_node_snapshot": "false",
"node_use_openssl": "true",
"node_use_v8_platform": "true",
"node_with_ltcg": "true",
"node_without_node_options": "false",
"openssl_fips": "",
"openssl_is_fips": "false",
"shlib_suffix": "so.72",
"target_arch": "x64",
"v8_enable_gdbjit": 0,
"v8_enable_i18n_support": 1,
"v8_enable_inspector": 1,
"v8_no_strict_aliasing": 1,
"v8_optimized_debug": 1,
"v8_promise_internal_field_count": 1,
"v8_random_seed": 0,
"v8_trace_maps": 0,
"v8_use_siphash": 1,
"v8_use_snapshot": 1,
"want_separate_host_toolset": 0,
"nodedir": "C:\\Users\\Lorenzo\\AppData\\Local\\node-gyp\\Cache\\12.4.0",
"standalone_static_library": 1,
"msbuild_path": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\15.0\\Bin\\MSBuild.exe"
}
}

File diff suppressed because it is too large Load diff

View file

@ -39,7 +39,7 @@ export class ImageCreatorService {
});
//todo da cambiare le dimensioni e renderle dinamiche
const canvas = createCanvas(1000, 800);
const canvas = createCanvas(150, 150);
const ctx = canvas.getContext('2d');
this.printHTMLElements(htmlElements, ctx);
this.printMouseClick(mouseClicks, ctx);