Skip to content
Snippets Groups Projects
Commit f678e4ef authored by Denis Arrivault's avatar Denis Arrivault
Browse files

Fully functionnal version

parent 0f5d29a2
No related branches found
No related tags found
No related merge requests found
...@@ -2,40 +2,7 @@ ...@@ -2,40 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="b736bff0-a367-4ebe-9b91-ad82d4524dd7" name="Default Changelist" comment=""> <list default="true" id="b736bff0-a367-4ebe-9b91-ad82d4524dd7" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___antlr4_annotations_4_2_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___antlr4_runtime_4_2_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___commons_cli_1_4_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___davis_core_0_5_2_86_ge8a13f2_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___davis_ui_0_5_2_86_ge8a13f2_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___digraph_parser_1_0_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___emmanuel_godard_udavis_zip_0_7rc1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___org_abego_treelayout_core_1_0_1_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle___tools_.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__commons_cli_commons_cli_1_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/classes/java/main/Main.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/classes/java/main/RingAnon2AgentsSym.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/classes/java/main/randomWalkRing.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/distributions/basic-example.tar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/distributions/basic-example.zip" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/libs/basic-example.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/scripts/basic-example" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/scripts/basic-example.bat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/tmp/jar/MANIFEST.MF" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/bin/udavis" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/bin/udavis.bat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/antlr4-annotations-4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/antlr4-runtime-4.2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/commons-cli-1.4.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/davis-core-0.5.2-86-ge8a13f2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/davis-ui-0.5.2-86-ge8a13f2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/digraph-parser-1.0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/org.abego.treelayout.core-1.0.1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/unpacked/dist/lib/tools.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenario" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenario" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" /> <ignored path="$PROJECT_DIR$/build/" />
...@@ -92,55 +59,36 @@ ...@@ -92,55 +59,36 @@
<session id="212679681"> <session id="212679681">
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="PLAIN_TEXT" value="2" /> <entry key="Markdown" value="1" />
<entry key="PLAIN_TEXT" value="3" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Groovy" value="113" /> <entry key="Groovy" value="113" />
<entry key="Markdown" value="710" />
<entry key="PLAIN_TEXT" value="8" /> <entry key="PLAIN_TEXT" value="8" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <counts>
<entry key="project.closed" value="1" /> <entry key="project.closed" value="1" />
<entry key="project.open.time.7" value="1" /> <entry key="project.open.time.7" value="2" />
<entry key="project.opened" value="1" /> <entry key="project.opened" value="2" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1455">
<caret line="97" column="1" selection-start-line="63" selection-end-line="97" selection-end-column="1" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state relative-caret-position="45"> <state split_layout="SPLIT">
<caret line="3" column="5" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" /> <first_editor relative-caret-position="495">
</state> <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
</provider> </first_editor>
</entry> <second_editor />
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
<folding>
<element signature="e#65#66#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -385,7 +333,7 @@ ...@@ -385,7 +333,7 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="$PROJECT_DIR$" value="4654351492000" /> <entry key="$PROJECT_DIR$" value="4654357010000" />
<entry key="$PROJECT_DIR$/.gradle" value="0" /> <entry key="$PROJECT_DIR$/.gradle" value="0" />
<entry key="$PROJECT_DIR$/build.gradle" value="1355409923" /> <entry key="$PROJECT_DIR$/build.gradle" value="1355409923" />
<entry key="$PROJECT_DIR$/gradle.properties" value="2061528551" /> <entry key="$PROJECT_DIR$/gradle.properties" value="2061528551" />
...@@ -523,6 +471,7 @@ ...@@ -523,6 +471,7 @@
<option value="$PROJECT_DIR$/src/scenario" /> <option value="$PROJECT_DIR$/src/scenario" />
<option value="$PROJECT_DIR$/build.gradle" /> <option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/README.md" />
</list> </list>
</option> </option>
</component> </component>
...@@ -546,8 +495,6 @@ ...@@ -546,8 +495,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -555,10 +502,17 @@ ...@@ -555,10 +502,17 @@
<item name="basic-example" type="b2602c69:ProjectViewProjectNode" /> <item name="basic-example" type="b2602c69:ProjectViewProjectNode" />
<item name="basic-example" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="basic-example" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path> </path>
<path>
<item name="basic-example" type="b2602c69:ProjectViewProjectNode" />
<item name="basic-example" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -701,17 +655,17 @@ ...@@ -701,17 +655,17 @@
<workItem from="1551370701189" duration="3504000" /> <workItem from="1551370701189" duration="3504000" />
<workItem from="1551445388781" duration="2362000" /> <workItem from="1551445388781" duration="2362000" />
<workItem from="1551449778392" duration="3023000" /> <workItem from="1551449778392" duration="3023000" />
<workItem from="1551454052741" duration="612000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9967000" /> <option name="totallyTimeSpent" value="10579000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="57" y="25" width="1623" height="1025" extended-state="6" /> <frame x="57" y="25" width="1623" height="1025" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Learn" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24152803" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24152803" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
...@@ -719,6 +673,7 @@ ...@@ -719,6 +673,7 @@
<window_info id="UI Designer" order="4" /> <window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" /> <window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" /> <window_info id="Favorites" order="6" side_tool="true" />
<window_info id="Learn" order="7" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.65496" visible="true" weight="0.32897604" /> <window_info anchor="bottom" id="Run" order="2" sideWeight="0.65496" visible="true" weight="0.32897604" />
...@@ -732,7 +687,6 @@ ...@@ -732,7 +687,6 @@
<window_info anchor="bottom" id="Terminal" order="10" /> <window_info anchor="bottom" id="Terminal" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.34504005" side_tool="true" weight="0.32897604" /> <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.34504005" side_tool="true" weight="0.32897604" />
<window_info anchor="bottom" id="Build" order="12" sideWeight="0.49969193" weight="0.32897604" /> <window_info anchor="bottom" id="Build" order="12" sideWeight="0.49969193" weight="0.32897604" />
<window_info anchor="right" id="Maven Projects" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -743,6 +697,7 @@ ...@@ -743,6 +697,7 @@
<window_info anchor="right" id="Palette&#9;" order="7" /> <window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Database" order="8" /> <window_info anchor="right" id="Database" order="8" />
<window_info anchor="right" id="Gradle" order="9" visible="true" weight="0.32963648" /> <window_info anchor="right" id="Gradle" order="9" visible="true" weight="0.32963648" />
<window_info anchor="right" id="Maven Projects" order="10" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -752,14 +707,6 @@ ...@@ -752,14 +707,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gradle.properties"> <entry file="file://$PROJECT_DIR$/gradle.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
...@@ -767,6 +714,23 @@ ...@@ -767,6 +714,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="5" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833">
<caret line="97" column="1" selection-start-line="63" selection-end-line="97" selection-end-column="1" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java"> <entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
...@@ -784,20 +748,13 @@ ...@@ -784,20 +748,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state relative-caret-position="1455"> <state split_layout="SPLIT">
<caret line="97" column="1" selection-start-line="63" selection-end-line="97" selection-end-column="1" /> <first_editor relative-caret-position="495">
<folding> <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
<element signature="n#!!doc" expanded="true" /> </first_editor>
</folding> <second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="5" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
# basic example using Davis # basic example using Davis
## Getting started with davis ## Getting started with Intellij
See 1- Clone the basic example repository :
or use ```
`./gradlew run` git clone https://gitlab.lis-lab.fr/davis/basic-example.git
## Basic CLI Usage
``` ```
udavis RingAnon2AgentsSym.java RandomIds 18 randomWalkRing.java
2- Open IntelliJ and load project :
``` ```
File/Open
```
Choose the basic-example folder and click ok
## Write new algorithm
1- Write your java algorithm into the src folder : MyAlgo.java
2- Open scenario file and add a line with 5 parameters :
<testName> <networkGeneratorFile> <scheme> <size> <algoFile : MyAlgo.java>
3- Refresh gradle panel.
4- In `Tasks/application` of the gradle panel you should see your testName as a
gradle task named "runtestName"
5- Click to execute.
## Without Intellij
1- Write your java algorithm into the src folder : MyAlgo.java
2- Open scenario file and add a line with 5 parameters :
<testName> <networkGeneratorFile> <scheme> <size> <algoFile : MyAlgo.java>
3- Execute in a terminal with `./gradlew runtestName`
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment