Skip to content

Update from Fall 2021 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roy-harmon wants to merge 186 commits into
base: master
Choose a base branch
from
Open

Update from Fall 2021 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
764f842
Spell Check round 1
May 31, 2019
6bb3937
sim_results gitignore
May 31, 2019
0f49b18
Property file level implementation of MOVING_DEVICES
Jun 3, 2019
a1df038
spelling fix
Jun 3, 2019
97d7d5d
Some refactors
Jun 3, 2019
91b0b8a
Refactor of variable names to eliminate abreviations
Jun 3, 2019
629e7ff
gravityWell reimplementation, speed up
Jun 3, 2019
03ed551
EdgeServerManager refactor
Jun 3, 2019
c408a24
Removed unused modulo logic and added error message for out of bounds…
jwc0045 Jun 4, 2019
2728093
Merge pull request #1 from abhorrid/master
AgentEnder Jun 4, 2019
70d1fc3
Edited rng to allow for seeding of task generation
Jun 3, 2019
95666cf
Merge branch 'master' of https://github.com/AgentEnder/PFogSim
Jun 4, 2019
b5d0d11
Final removal of random changes
Jun 3, 2019
9b83229
Merge pull request #1 from AgentEnder/master
jwc0045 Jun 4, 2019
6787d46
Merge pull request #2 from abhorrid/master
jwc0045 Jun 4, 2019
021f363
Console text is now created into a text file
jwc0045 Jun 5, 2019
b36a570
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 5, 2019
3050975
Confirmed mobility of devices in GPSVectorMobility
jwc0045 Jun 6, 2019
7d0e1e3
Matlab updates
Jun 6, 2019
381e81f
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 6, 2019
88b0b3b
Added MobileUser class for future implementation of Producer/Consumer…
jwc0045 Jun 7, 2019
f5d9360
MobileUsers initialized with Location. Code runs with current Produce…
jwc0045 Jun 10, 2019
344d8c6
Comparison Graphs
Jun 11, 2019
1542586
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 11, 2019
4578d90
Merge pull request #2 from AgentEnder/master
jwc0045 Jun 11, 2019
6b063c9
Producer/Consumer Separation 90% implemented?
jwc0045 Jun 11, 2019
12e9523
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 11, 2019
9673716
Merge pull request #3 from jwc0045/master
jwc0045 Jun 11, 2019
103397f
Producer and Consumer are separate locations, unsure if fully impleme…
jwc0045 Jun 11, 2019
0fcb957
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 11, 2019
5e889d4
Push
jwc0045 Jun 12, 2019
45ddc0e
Profiling Results
Jun 12, 2019
e312512
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 12, 2019
97f8e44
Producer consumer separation distance metrics
Jun 12, 2019
d83dce1
Calculated avg. hops from host to user.
jwc0045 Jun 13, 2019
e80b40f
Added data values for router layers to DataInterpreter.java
CameronMB Jun 13, 2019
82ba4a6
Merge branch 'master' of https://github.com/AgentEnder/PFogSim
CameronMB Jun 13, 2019
f14b6f9
Hops Back calculation bug fix
Jun 13, 2019
00b3733
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 13, 2019
ba3897d
Graphs
Jun 14, 2019
6ae2531
Altitude Propogation
Jun 17, 2019
47c8418
Altitude Changes
Jun 18, 2019
d6a7378
Records additional metrics and appends them to additional log files
jwc0045 Jun 19, 2019
2629b4b
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 19, 2019
c63e491
Mobility in altitude
Jun 19, 2019
18e039f
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 19, 2019
b7ff950
Additional Altitude Fixes
Jun 19, 2019
a86b170
Binary Heap
Jun 19, 2019
103c302
Binary Heap Implementation vs Radix
Jun 20, 2019
e3cf997
Fixed bug for producer consumer separation
jwc0045 Jun 20, 2019
6e15836
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 20, 2019
07385b3
Created energy package and EnergyModel class
Jun 20, 2019
e06fcf4
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 20, 2019
d0bd8cb
Binary Heap comments
Jun 20, 2019
ab10bb2
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 20, 2019
d5ce1c5
Modified energy model class to add skeleton capability
Jun 20, 2019
d699e0f
Device Separation as an Option in config
AgentEnder Jun 20, 2019
2125ff9
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
AgentEnder Jun 20, 2019
c714919
Added comments to EnergyModel.java
Jun 20, 2019
d506d10
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 20, 2019
9990ba5
Implemented initial versions of getUploadEnergy, getDownloadEnergy, c…
Jun 21, 2019
71b281e
Commit for .gitignore issue
Jun 21, 2019
add30de
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 21, 2019
567f411
gbugb
AgentEnder Jun 21, 2019
5889a12
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
AgentEnder Jun 21, 2019
b0d4360
Updated DataInterpreter.java with new max power consumption values. C…
Jun 21, 2019
7e56555
Implemented more dynamic energy consumption measurement
Jun 21, 2019
12126f8
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
AgentEnder Jun 21, 2019
7372149
Producer/consumer bug
jwc0045 Jun 24, 2019
927cef0
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 24, 2019
d29108b
Added new values for fog node power consumotion to DataInterpreter.java
Jun 24, 2019
01cf864
Made some edits to DataInterpreter.java
Jun 24, 2019
01aacd2
producer consumer fix
jwc0045 Jun 24, 2019
821f5f8
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
AgentEnder Jun 24, 2019
0724e15
Finalized current version of energy model -- testing now
Jun 24, 2019
265cd35
Updated model unit system and commented
Jun 25, 2019
4691a06
clean up
jwc0045 Jun 25, 2019
3ee8d0e
Added nodeSet to EnergyModel
Jun 25, 2019
44bf535
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 25, 2019
496ac53
clean up
jwc0045 Jun 25, 2019
fbd52df
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
AgentEnder Jun 25, 2019
ef94c05
separation config fix
AgentEnder Jun 25, 2019
50c8bfd
Fixed idle router energy usage again
Jun 25, 2019
5fc32ed
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
Jun 25, 2019
1eb125b
Added plus equals sign for Cameron :)
Jun 25, 2019
5ff2a36
Found what was causing blackhole. Temp fix is not having node w same …
jwc0045 Jun 26, 2019
cf70ca8
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 26, 2019
300364b
Changed time calculation in idleEnergy in EnergyModel
Jun 27, 2019
b009e44
fixed bug where simulation created 2x mobile devices
jwc0045 Jun 27, 2019
eb1988d
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 27, 2019
481ce12
added mobility of fog nodes
jwc0045 Jun 27, 2019
85f7757
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
jwc0045 Jun 27, 2019
02bd56c
Haversine implementation for 3D distance
AgentEnder Jun 28, 2019
040d000
Deleted Voronoi, Added mobility of each fog level in config file
jwc0045 Jun 28, 2019
3bfe4a4
Merge pull request #1 from AgentEnder/master
AgentEnder Jul 1, 2019
926c523
Removed more voronoi implementation, fixed bug adding to Coords array…
jwc0045 Jul 2, 2019
2dcc37b
Signed-off-by: Matthew Merck <mlm0175@auburn.edu>
Jul 3, 2019
3b45264
Added generic logging capability to SimLogger
Jul 3, 2019
7e79fd0
Merge pull request #3 from AgentEnder/master
AgentEnder Jul 9, 2019
5a0f706
Readme Updates
AgentEnder Jul 12, 2019
9a5fb9e
Updated class interactions graph, added remaining metric script
AgentEnder Jul 12, 2019
0116e02
Merge branch 'master' of https://github.com/AgentEnder/PFogSim.git
AgentEnder Jul 12, 2019
431b4d6
Update README.md
AgentEnder Jul 12, 2019
dcadabf
Update README.md
AgentEnder Jul 12, 2019
aa8f90c
Added Comments and Documentation
Jul 12, 2019
99d424d
Merge branch 'master' of https://github.com/AgentEnder/PFogSim
Jul 12, 2019
28228d0
Final changes to XYVectorMobility to mirror changes in GPSVecotrMobility
jwc0045 Jul 15, 2019
ff43336
added max_distance to applications.xml and read it in SimSettings.java
jwc0045 Jul 15, 2019
47633ae
fixed typo in code
jwc0045 Jul 18, 2019
24c7836
Merge pull request #4 from AgentEnder/master
AgentEnder Jul 19, 2019
f77813d
Update README.md
AgentEnder Jul 19, 2019
0258a9b
Merge pull request #5 from AgentEnder/master
AgentEnder Jul 19, 2019
c795e6d
Update README.md
szs0117 Jul 26, 2019
9438451
Update README.md
szs0117 Jul 30, 2019
d81b050
Update README.md
baskiyar Aug 1, 2019
0417c82
Merge pull request #1 from roy-harmon/REU2019
roy-harmon Oct 6, 2021
68856aa
Combine MATLAB scripts for all combinations of mobility and iterations
roy-harmon Oct 7, 2021
f768be8
Create outputFolder automatically if non-existent
roy-harmon Oct 7, 2021
b410528
Automatically generate plots for all represented app types
roy-harmon Oct 7, 2021
3de0820
Delete scripts/Analysis/MultipleIter directory
roy-harmon Oct 7, 2021
47d7e89
Delete scripts/Analysis/OneIter directory
roy-harmon Oct 7, 2021
69759bc
Removed deprecated MATLAB scripts
roy-harmon Oct 8, 2021
b711ef2
Add function to auto-detect configuration based on output files present
roy-harmon Oct 8, 2021
9daf95a
Merge remote-tracking branch 'origin/feature' into feature
roy-harmon Oct 8, 2021
c11f06b
Add configuration class with properties to replace getConfiguration(int)
roy-harmon Oct 8, 2021
2cbb5c6
Update plotGenericResult to use configuration class; fix typo
roy-harmon Oct 10, 2021
1ae9662
Fix autoconfig number of devices, add plots to plotAllPlots
roy-harmon Oct 10, 2021
7993da7
Improve formatting of color plots & error bars
roy-harmon Oct 10, 2021
3088ef4
Add return value for plotGenericResult function
roy-harmon Oct 10, 2021
c25b76b
Update README.md
roy-harmon Oct 11, 2021
ba7a84c
Update README.md
roy-harmon Oct 11, 2021
5720fe4
Update README.md
roy-harmon Oct 11, 2021
fda31e0
Add support for log scale on monochrome plots
roy-harmon Oct 11, 2021
71f99c5
Fix missing delimiter in genericResult output string
roy-harmon Oct 11, 2021
6562a31
Remove redundant code
roy-harmon Oct 11, 2021
63188cc
Add comments for help documentation
roy-harmon Oct 12, 2021
d707d65
Merge pull request #2 from roy-harmon/feature
roy-harmon Oct 12, 2021
ec7b913
Update README.md
roy-harmon Oct 12, 2021
d88fd41
Optimize plot size for better image resolution
roy-harmon Oct 19, 2021
6514e92
Move exportgraphics out of plotGenericResult
roy-harmon Oct 20, 2021
a6f1fc1
Append each generated plot to a multi-page PDF
roy-harmon Oct 20, 2021
ba7d12e
Merge pull request #3 from roy-harmon/feature
roy-harmon Oct 20, 2021
01083ad
Ignore generated files
roy-harmon Oct 20, 2021
b4381c7
Merge branch 'master' of https://github.com/roy-harmon/PFogSim
roy-harmon Oct 20, 2021
6503c62
Resolve naming conflict, pass config parm, add plot margin
roy-harmon Oct 26, 2021
993a58d
Change deprecated dlmread to readmatrix
roy-harmon Oct 26, 2021
1450bcc
Add comments, remove redundant traverse() call, remove unused imports
roy-harmon Oct 29, 2021
7fcd4a7
Remove unused imports
roy-harmon Oct 29, 2021
abfc636
Remove redundant getDownloadDelay and getDownloadEnergy calls
roy-harmon Oct 29, 2021
bc924bb
Add createOutputFolder function
roy-harmon Oct 29, 2021
b3d3a8f
Remove unused imports
roy-harmon Oct 29, 2021
509fe74
Stop deleting result data
roy-harmon Oct 29, 2021
6ff6708
Reduce default mobile device numbers
roy-harmon Oct 29, 2021
fe28289
Add comments, tweak PDF file name
roy-harmon Oct 29, 2021
be6363f
Replace magic numbers with named constants and enums
roy-harmon Nov 11, 2021
143afc1
Clean up magic numbers with named constants, remove unused args
roy-harmon Nov 11, 2021
f59dd68
Add constants
roy-harmon Nov 11, 2021
990cbd6
Remove commented code
roy-harmon Nov 11, 2021
5fad053
Replace obvious magic numbers with named constants
roy-harmon Nov 11, 2021
608c419
Add HashMap to store Dijkstra paths and avoid excessive calculation
roy-harmon Dec 7, 2021
d5fd7a7
Modified MIPS functions in EdgeHost to assign MIPS percentage per layer
roy-harmon Dec 7, 2021
89d57cf
Externalize nodeSpecs
roy-harmon Dec 7, 2021
2c41ba1
Add missing libraries
roy-harmon Dec 7, 2021
d6320dd
Split line for readaability
roy-harmon Dec 7, 2021
6e8eacd
Merge pull request #4 from roy-harmon/roy-harmon/optimization
roy-harmon Dec 7, 2021
ac4e3fc
Update README.md
roy-harmon Dec 10, 2021
20f7e0f
Fix autoConfig call
roy-harmon Dec 13, 2021
ca41bad
Fix folder path and mean parameters
roy-harmon Dec 14, 2021
35d8b99
Add comments and present configuration in a more user-friendly way
roy-harmon Dec 14, 2021
4c926e6
Add validation to IncludeErrorBars and ColorPlot properties
roy-harmon Dec 14, 2021
1aef16f
Implement changes from PFogSim\zzt0009 master branch
roy-harmon Dec 14, 2021
53a47b4
Merged with zzt0009/PFogSim
zzt0009 Dec 15, 2021
841f95f
Remove extra for loop to accommodate recent changes from zzt0009 fork
roy-harmon Dec 18, 2021
098fcae
Add line breaks to console, fix redundant findNode call
roy-harmon Jan 2, 2022
d54e4bf
Remove extra *100
roy-harmon Jan 2, 2022
cb084e9
Fix output percentages
roy-harmon Jan 2, 2022
97ae355
Fix Router.findPath returning null paths
roy-harmon Jan 2, 2022
b0152d0
Remove 1:1 device-host assignment
roy-harmon Jan 2, 2022
f4ced3e
Add branch logic for 1:1 mobile device assignment
roy-harmon Jan 8, 2022
5e7d068
Create codeql-analysis.yml
roy-harmon Jan 18, 2022
f454134
First pass at replacing pair class
MatthewFreestone Jan 24, 2022
589aa51
Used eclipse versions for hashcode and equals
MatthewFreestone Jan 25, 2022
af35afc
Revert "Create codeql-analysis.yml"
roy-harmon Feb 2, 2022
cb570ae
Corrected Linking of Puddles
supersmartz Feb 18, 2022
795f261
Merge pull request #6 from MatthewFreestone/ReplacePair
roy-harmon Mar 21, 2022
52a2a23
Merge pull request #7 from supersmartz/master
roy-harmon Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,17 @@
*.log
scripts/Analysis/MultipleIter/matlab_notmoving/plotAvgVmUtilization.asv
scripts/Analysis/MultipleIter/matlab_notmoving/plotAvgVmUtilization.asv
simresults/ite/*
simresults/ite2/*
simresults/ite3/*
simresults/ite4/*
simresults/ite5/*
simresults/ite6/*
scripts/sample_application/config/node_test.xml
scripts/sample_application/config/node_test.xml
scripts/sample_application/links_test.xml
*.pdf
scripts/Analysis/matlab/plotGenericResults.m
*.png
scripts/Analysis/matlab/prcnt_histgraph.m
scripts/Analysis/matlab/plotHistFailedTasks.m
26 changes: 13 additions & 13 deletions .settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
4 changes: 2 additions & 2 deletions Chicago_CityHall.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Id,latitude,longitude
1,41.88386,-87.631631
Id,latitude,longitude,altitude,dx,dy
1,41.88386,-87.631631,0,0,0
Loading