Skip to content
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

Jump to bottom

Firefighter problem #13

Merged
merged 119 commits into from
Aug 3, 2024
Merged

Firefighter problem #13

merged 119 commits into from
Aug 3, 2024

Conversation

20shaked20
Copy link
Contributor

No description provided.

Almog-David and others added 30 commits May 28, 2024 16:10
@Almog-David
firefighter problem
470fe12
@Almog-David
all tests are working in the library
8f4753d
@20shaked20
added dirlay integer rounding function
acea2a9
@20shaked20
Fixed node capacity function for dirlay + added a correction to its …
c3318f4 
…tests
@Almog-David
fixed heuristic functions + added print that give the user more infor…
525d52f 
…mation
@Almog-David
add a lot of prints for the user to understand what happening
cabc9ed
@20shaked20
Fixed how the Mincut returns the nodes and groups them into N groups …
9b5fba3 
…and added corrections to its corresponding tests
@20shaked20
Minor fix
415e821
@Almog-David
minimal changes
7707972
@20shaked20
Matrix_to_integers should be ok, also added few tests and minor tweak…
a0e0ca4 
…s to it
@Almog-David
Merge pull request #1 from The-Firefighters/improvements
ee648bf 
Improvements
@20shaked20
Merge pull request #2 from The-Firefighters/dirlay_fixes
9eb8fe3 
Dirlay fixes
@Almog-David
move the test to the correct location
f1219fd
@Almog-David
Merge pull request #3 from The-Firefighters/improvements
6742685 
move the test to the correct location
@20shaked20
Fixed calcualtion of vaccine matrix! and its approripate tests which …
546079d 
…had some issues also
@20shaked20
Dirlay implementation done, testing are passing
0b1779d
@20shaked20
Merge pull request #4 from The-Firefighters/dirlay_fixes
1dea0be 
Dirlay fixes
@20shaked20
minor changes depcreating for now test_utils, as we do not use it and…
b2f1188 
… not need it for now
@20shaked20
some comments + removed unnecasry comments
521d002
@YuvalBubnovsky
Added logging, added docstrings for hueristic functions
9bb5cc7
@YuvalBubnovsky
Merge pull request #5 from The-Firefighters/yuval/logging_etc
2b077ce 
Added logging, added docstrings for hueristic functions
@20shaked20
Added headers for each file + created a basic main for demonstartion …
efb7f34 
…of doctest in the firefighter_problem.py
@20shaked20
Add files via upload
a022a44
@20shaked20
Enum for node status
55f50ce
@20shaked20
Moved CleanGraph to the head of the function
48f9533
@20shaked20
Moved graphs.json to its correct place
e9b2c95
@20shaked20
some fixes for dirlay tests+added randomized directed layered network…
79c49bb 
… graph generator
@20shaked20
removed uneeded test.py
b349c7b
@20shaked20
Removed uneeded code from lib
bf05df4
@20shaked20
Merge pull request #6 from The-Firefighters/fixes
d8af684 
Fixes
Almog-David and others added 29 commits July 21, 2024 00:37
@Almog-David
changes to the heuristic functions. need to validate answers
efb9aab
@Almog-David
fixed problem with heuristic algorithm
8feeb8f
@20shaked20
Minor fix
42658cd
@YuvalBubnovsky
re-factored random di graph generator
0efb369
@20shaked20
CSV
b4338da
@20shaked20
Merge pull request #21 from The-Firefighters/yuval/improvments
36a1e4e 
Yuval/improvments
@20shaked20
Max save random comparision created
e297d1c
@Almog-David
time improvement in the heuristic function
089c047
@Almog-David
format changes in utils and firefighter files
6d2e5cb
@20shaked20
Fixed the problem with not showing name + seprate random gen to other…
faf08e2 
… script
@20shaked20
Merge branch 'almog_heuristic' of https://github.com/The-Firefighters…
2ddc2c5 
…/networkz into almog_heuristicsss
@20shaked20
fix
d57d616
@Almog-David
minor fixes due to changes in the main functions of non_spreading
947988c
@20shaked20
Fixed some testings + commentings
5991624
@20shaked20
Merge pull request #22 from The-Firefighters/almog_heuristic
a4aadff 
Tests, Comparisons, improvements to heuristics and some commentings
@Almog-David
loggs minor changes
a3f3d9f
@erelsgl
setup logger to main
33abffd
@erelsgl
minbudget using mincut
4ea6d73
@erelsgl
png file name
9a43bc7
@Almog-David
nonspreading minbudget returns the vaccination strategy
04501b2
@Almog-David
minor changes in comparison
738fd26
@Almog-David
added more graph plots for maxsave
b4a3202
@Almog-David
dirlay returns a list instead of dictionary
c2077cf
@erelsgl
move comparisons folder
7838c81
@erelsgl
ignore experiments folder
1c8f3c8
@erelsgl
rename comparisons to experiments
23b7916
@erelsgl
move comparisons to experiments subfolder
4b413b6
@Almog-David
fixed problem with doctest regarding create_st_graph
ecb10c3
@Almog-David
fixed path to comparisons
33f73e0
@erelsgl erelsgl merged commit a9f1e33 into ariel-research:master Aug 3, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erelsgl erelsgl erelsgl left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@20shaked20 @erelsgl @Almog-David @YuvalBubnovsky