maggicl
/
PF3
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HW2: preparing for submission

This commit is contained in:
Claudio Maggioni 2019-11-11 00:39:49 +01:00
parent ffd8fbf895
commit cb78907485
12 changed files with 155 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw2/Ex1/.classpath Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="out/production/Ex1"/>
</classpath>

31
hw2/Ex1/.idea/workspace.xml
View File

@ -2,13 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b727764e-c290-4ab7-a944-02a848fa4a41" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/../Ex2/.idea/Ex2.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../Ex2/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../Ex2/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../Ex2/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../Ex2/src/ConcurrentVoteCounter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../submission.tex" beforeDir="false" afterPath="$PROJECT_DIR$/../submission.tex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Ex3/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Ex3/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -21,11 +15,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/bintree/Tester.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" selection-end-line="97" />
<caret selection-end-line="97" />
<folding>
<element signature="e#441#442#0" expanded="true" />
<element signature="e#478#479#0" expanded="true" />
@ -34,6 +28,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Ex1.eml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/bintree/BinTree.java">
<provider selected="true" editor-type-id="text-editor">
@ -125,6 +124,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -147,8 +148,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@ -215,17 +214,18 @@
<workItem from="1573115639742" duration="3855000" />
<workItem from="1573398260802" duration="3728000" />
<workItem from="1573416058033" duration="28000" />
<workItem from="1573429110033" duration="27000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7611000" />
<option name="totallyTimeSpent" value="7638000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22283272" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22527473" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@ -276,7 +276,7 @@
<entry file="file://$PROJECT_DIR$/src/bintree/Tester.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" selection-end-line="97" />
<caret selection-end-line="97" />
<folding>
<element signature="e#441#442#0" expanded="true" />
<element signature="e#478#479#0" expanded="true" />
@ -322,6 +322,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Ex1.eml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</component>
<component name="masterDetails">
<states>

15
hw2/Ex1/.project Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Ex1</name>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments/>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

8
hw2/Ex1/Ex1.eml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<component inherit-compiler-output="true" inheritJdk="true">
<output-test url="file://$MODULE_DIR$/out/test/Ex1"/>
<exclude-output/>
<contentEntry url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/out"/>
</contentEntry>
</component>

6
hw2/Ex2/.classpath Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="out/production/Ex2"/>
</classpath>

47
hw2/Ex2/.idea/workspace.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="19fb80a5-3326-4689-b0ba-ecd6ab32d599" name="Default Changelist" comment="" />
<list default="true" id="19fb80a5-3326-4689-b0ba-ecd6ab32d599" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../Ex1/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Ex1/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Ex3/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Ex3/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -16,13 +19,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ConcurrentVoteCounter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="64" lean-forward="true" selection-start-line="9" selection-start-column="64" selection-end-line="9" selection-end-column="64" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#454#455#0" expanded="true" />
<element signature="e#500#501#0" expanded="true" />
</folding>
<state>
<caret column="27" lean-forward="true" selection-start-column="27" selection-end-column="27" />
</state>
</provider>
</entry>
@ -32,10 +30,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<folding>
<element signature="e#441#442#0" expanded="true" />
<element signature="e#478#479#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -155,17 +149,17 @@
<updated>1573415904376</updated>
<workItem from="1573415905557" duration="151000" />
<workItem from="1573416086677" duration="1590000" />
<workItem from="1573429138414" duration="33000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1741000" />
<option name="totallyTimeSpent" value="1774000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25274727" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25579977" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@ -173,7 +167,6 @@
<window_info id="UI Designer" order="5" />
<window_info id="Learn" order="6" />
<window_info id="Favorites" order="7" side_tool="true" />
<window_info anchor="bottom" id="Messages" weight="0.32959184" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32959184" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32959184" />
@ -186,6 +179,7 @@
<window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.32959184" />
<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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@ -201,10 +195,10 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/VoteCounter.java">
<entry file="file://$PROJECT_DIR$/src/ConcurrentVoteCounter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
<state>
<caret column="27" lean-forward="true" selection-start-column="27" selection-end-column="27" />
</state>
</provider>
</entry>
@ -212,22 +206,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<folding>
<element signature="e#441#442#0" expanded="true" />
<element signature="e#478#479#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ConcurrentVoteCounter.java">
<entry file="file://$PROJECT_DIR$/src/VoteCounter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="64" lean-forward="true" selection-start-line="9" selection-start-column="64" selection-end-line="9" selection-end-column="64" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#454#455#0" expanded="true" />
<element signature="e#500#501#0" expanded="true" />
</folding>
<state relative-caret-position="30">
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
</state>
</provider>
</entry>

15
hw2/Ex2/.project Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Ex2</name>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments/>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

6
hw2/Ex2/Ex2.eml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component inherit-compiler-output="true" inheritJdk="true">
<output-test url="file://$MODULE_DIR$/out/test/Ex2"/>
<exclude-output/>
<contentEntry url="file://$MODULE_DIR$"/>
</component>

6
hw2/Ex3/.classpath Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="out/production/Ex3"/>
</classpath>

56
hw2/Ex3/.idea/workspace.xml
View File

@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b6c476d3-708a-4f72-b206-a0dd033057e4" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/parallel/StreamsPrimeCounter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Ex2/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Ex2/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parallel/ForkJoinPoolPrimeCounter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/parallel/ForkJoinPoolPrimeCounter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parallel/ThreadPoolPrimeCounter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/parallel/ThreadPoolPrimeCounter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/Tester.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/Tester.java" afterDir="false" />
</list>
<list default="true" id="b6c476d3-708a-4f72-b206-a0dd033057e4" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -20,15 +14,30 @@
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/Tester.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="68" />
<state relative-caret-position="280">
<caret line="62" column="36" selection-start-line="62" selection-start-column="36" selection-end-line="62" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Ex3.eml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.project">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Ex3.userlibraries">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/parallel/StreamsPrimeCounter.java">
<provider selected="true" editor-type-id="text-editor">
@ -156,6 +165,10 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="util" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Ex3" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path>
</expand>
<select />
</subPane>
@ -165,6 +178,7 @@
</component>
<component name="PropertiesComponent">
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
@ -216,16 +230,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1573424652116</updated>
<workItem from="1573424653239" duration="3423000" />
<workItem from="1573424653239" duration="3583000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3423000" />
<option name="totallyTimeSpent" value="3583000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Designer" />
<window_info id="Image Layers" />
@ -233,7 +246,7 @@
<window_info id="UI Designer" />
<window_info id="Favorites" side_tool="true" />
<window_info id="Learn" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24969475" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24969475" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
@ -243,7 +256,7 @@
<window_info anchor="bottom" id="Messages" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32959184" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32959184" />
<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" />
@ -303,11 +316,20 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/test/Tester.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="68" />
<state relative-caret-position="280">
<caret line="62" column="36" selection-start-line="62" selection-start-column="36" selection-end-line="62" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Ex3.userlibraries">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.project">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Ex3.eml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</component>
<component name="masterDetails">
<states>

15
hw2/Ex3/.project Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Ex3</name>
<comment/>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments/>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

6
hw2/Ex3/Ex3.eml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component inherit-compiler-output="true" inheritJdk="true">
<output-test url="file://$MODULE_DIR$/out/test/Ex3"/>
<exclude-output/>
<contentEntry url="file://$MODULE_DIR$"/>
</component>