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.

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

feat: custom cluster removal #117

Merged
merged 15 commits into from
Mar 29, 2023
Merged

feat: custom cluster removal #117

merged 15 commits into from
Mar 29, 2023

Conversation

airscholar
Copy link
Owner

No description provided.

src/resilience.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@sferez sferez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove_node function

@airscholar airscholar requested a review from sferez March 29, 2023 21:25
@sferez sferez merged commit c371027 into dev Mar 29, 2023
sferez added a commit that referenced this pull request Apr 26, 2023
* feat: added dynamic visualisation on the map based on lat and long

* excluded uploaded files from commit

* added interative visualisation of metrics

* feat: added clustering algorithms

* chore: refactored visualisation location

* chore: removed .DS_Store

* chore: removed rail.py

* feat: added spectral clustering

* .

* feat: added more clustering algorithms

* spectral, * kmeans, * agglomerative

* chore: code cleanup

* Update app.cpython-311.pyc

* latest codebase

added more clustering

* update

1) All clusters added (complted sprint 3)
2) moved general metrics to seperate page

* Fix 0 margin on all gaphs

* Fix map layout when not spatial

* fix /

* raise error if 'map' and not spatial

* .

* rm .github

* rm pycache

* update

1) Storing an netoworkObject into session
2) Tested all cluster
Found 3 errors. Raised on github
3) General metrics to other page
Done under uploaded_dataset route.
But not added frontend menu to route there.
4) Visualisation Tab
Tabs: network, Temporal
temporal is not showing is graph is spatial, only dynamic toggle and layout dropdown is kept

* add return nan in visualisation

* add .github

* add .github

* return 'no_graph.html'

* rm __pycache__

* update

Added all_metrics template.
Removed dynamic toggle from all_metrics

* update

if n/w graph is spatial then layout=map else sfdp added for all_metrics

* Delete app.cpython-311.pyc

* update

-single metrics template added
-keeping multi and directed toggle on
-removed dynamic from boxplot,violin,histogram
-toggle layout based on networkkGraph type

* fix: k-clique clustering bug

* update

removed multi and directed toggle for clustering

* update

New field added in cluster, i.e Number of cluster, by default value None

* update

applied working method to every cluster

* update

Hotspot changes, remvoed coldspot, kept only iframe and data

* update

feat:
added forms in resilience analysis (random, malicious, cluster).
working input from user.

* update

fix:
removed girvan_newman & edge_betweenness cluster

* networkGRaphs cache

* change compute global metrics

* add temporal graphs

* rm fig.show

* update

fixed networkGraph object. and moved dataset on homepage and created seperate page for global metrics

* Update 2029240f6d1128be89ddc32729463129

* update

feat: global metrics

* removed flask session

* update

* fix: basic visualisation

* feat: add clean df for frontend

* fix: returned no graph instead of errors

* fix: path for dynamic graphs

* update

found error of dynamic visualisation,
in malicious resilience changed type of attach as metrics names,

* update

fix bugs

* fix: set/get key name

* Update app.py

* feat: removed no graph from ml communities

* fix: import

* fix: index 0 frontend bug

* fix: temporal no graph is not temporal

* minor chagnes

* fix: error with index 0

* fix: error with index 0

* update

1) if graph is spatial change layout for cluster
2) Removed hirerachical
3) Removed Edge all
4) Tooltips added
5) Accordian Added for resilience cluster

* change

added tooltips for visualisation page

* fix: Assertion Error when using Dynamic for MTX/CUSTOM

* fix: use cache even when arg not in same order

* feat: template resilience analysis

* feat: added custom cluster size to a few clustering algorithms (#102)

* feat: added custom cluster size to a few clustering algorithms

* feat: added custom cluster size to a few clustering algorithms

* fix: index 0 error

* fix: argument passing

* feat: add custom title for clustering

* feat: add custom title for clustering

* feat: resilience

* feat: Kmeans

* update

1) working accordian
2) tabs from 5.2 added

* feat: resilience analysis

* feat: minor changes

1) added spinner after using app with sample datasets
2) added tooltips on sample dataset card to understand which dataset it is

* feat: clustering

* fix: 105 valueerror n samples=5 should be = n clusters=6 agglomerative clustering custom ff (#107)

* feat: production deployment for sprint 3 (#75)

* .

* Update app.cpython-311.pyc

* latest codebase

added more clustering

* update

1) All clusters added (complted sprint 3)
2) moved general metrics to seperate page

* Fix 0 margin on all gaphs

* Fix map layout when not spatial

* fix /

* raise error if 'map' and not spatial

* .

* rm .github

* rm pycache

* update

1) Storing an netoworkObject into session
2) Tested all cluster
Found 3 errors. Raised on github
3) General metrics to other page
Done under uploaded_dataset route.
But not added frontend menu to route there.
4) Visualisation Tab
Tabs: network, Temporal
temporal is not showing is graph is spatial, only dynamic toggle and layout dropdown is kept

* add return nan in visualisation

* add .github

* add .github

* return 'no_graph.html'

* rm __pycache__

* update

Added all_metrics template.
Removed dynamic toggle from all_metrics

* update

if n/w graph is spatial then layout=map else sfdp added for all_metrics

* Delete app.cpython-311.pyc

* update

-single metrics template added
-keeping multi and directed toggle on
-removed dynamic from boxplot,violin,histogram
-toggle layout based on networkkGraph type

* fix: k-clique clustering bug

* update

removed multi and directed toggle for clustering

* update

New field added in cluster, i.e Number of cluster, by default value None

* update

applied working method to every cluster

* update

Hotspot changes, remvoed coldspot, kept only iframe and data

* update

feat:
added forms in resilience analysis (random, malicious, cluster).
working input from user.

* update

fix:
removed girvan_newman & edge_betweenness cluster

* networkGRaphs cache

* change compute global metrics

* add temporal graphs

* rm fig.show

* update

fixed networkGraph object. and moved dataset on homepage and created seperate page for global metrics

* Update 2029240f6d1128be89ddc32729463129

* update

feat: global metrics

* removed flask session

* update

---------

Co-authored-by: sferez <simeon.ferez@gmail.com>
Co-authored-by: Tejas Patil <tejas.coder@gmail.com>

* fix: valueerror: n_samples=5 should be >= n_clusters=6.

---------

Co-authored-by: sferez <simeon.ferez@gmail.com>
Co-authored-by: Tejas Patil <tejas.coder@gmail.com>

* feat: clustering

* fix: clustering

* fix: clustering

* feat: malicious resilience analysis

* feat: malicious resilience analysis

* fix: refactor return_nan and clean_df in utils.py

* feat: template report generation

* feat: cluster resilience analysis (#111)

* feat: added custom cluster size to a few clustering algorithms

* feat: added custom cluster size to a few clustering algorithms

* feat: added custom cluster size to a few clustering algorithms

* feat: cluster resilience analysis

* feat: cluster resilience analysis

* chore: clean up code

* before change update

all tabs are replaced with bootstrap 5.2

* fix: bugs, feat: description, tooltip (#79)

* update

found error of dynamic visualisation,
in malicious resilience changed type of attach as metrics names,

* update

fix bugs

* fix: set/get key name

* Update app.py

* minor chagnes

* update

1) if graph is spatial change layout for cluster
2) Removed hirerachical
3) Removed Edge all
4) Tooltips added
5) Accordian Added for resilience cluster

* change

added tooltips for visualisation page

* update

1) working accordian
2) tabs from 5.2 added

* feat: minor changes

1) added spinner after using app with sample datasets
2) added tooltips on sample dataset card to understand which dataset it is

* before change update

all tabs are replaced with bootstrap 5.2

* fix: cluster security

* fix: cluster security (#112)

* changed degree centrality only

* feat: deep learning

* update

made common single_metrics function to render template

* Revert "update"

This reverts commit b306a60.

* Revert "Revert "update""

This reverts commit 0c05b7f.

* working directories

* updates

* error

resilience random

* feat: custom resilience

* feat: custom cluster removal (#117)

* feat: added custom cluster size to a few clustering algorithms

* feat: added custom cluster size to a few clustering algorithms

* feat: added custom cluster size to a few clustering algorithms

* feat: cluster resilience analysis

* feat: cluster resilience analysis

* chore: clean up code

* fix: fixed utils import bug

* feat: added custom cluster removal

* feat: added custom cluster removal

* feat: added custom cluster removal

* feat: added custom cluster removal

* update

made custom response for random resilience input form

visualization tab working

* update

working
1) Random Resilience Analysis
-- Nodes
---- Visualisation
---- Centrality
------ Degree Centrality

* feat: reduce x10 html files size

* feat: resilience random (#115)

* update

found error of dynamic visualisation,
in malicious resilience changed type of attach as metrics names,

* update

fix bugs

* fix: set/get key name

* Update app.py

* minor chagnes

* update

1) if graph is spatial change layout for cluster
2) Removed hirerachical
3) Removed Edge all
4) Tooltips added
5) Accordian Added for resilience cluster

* change

added tooltips for visualisation page

* update

1) working accordian
2) tabs from 5.2 added

* feat: minor changes

1) added spinner after using app with sample datasets
2) added tooltips on sample dataset card to understand which dataset it is

* before change update

all tabs are replaced with bootstrap 5.2

* changed degree centrality only

* update

made common single_metrics function to render template

* Revert "update"

This reverts commit b306a60.

* Revert "Revert "update""

This reverts commit 0c05b7f.

* working directories

* error

resilience random

* update

made custom response for random resilience input form

visualization tab working

* update

working
1) Random Resilience Analysis
-- Nodes
---- Visualisation
---- Centrality
------ Degree Centrality

---------

Co-authored-by: sferez <simeon.ferez@gmail.com>

* feat: dynamic scale size visualisation

* feat: resilience return df of changed

* feat: resilience return df of changed

* update

Resilience Random Node
centrality working

* update

kcore node working

* fix: longest iterations issue

* feat: resilience example documentation

* docs: Formatting and documentation

* update

resilience random, nodes working

* fix: rm std from frontend visualisation

* feat: memoize expensive computing functions

* update

working resilience random

* fix: Kmeans clustering

* fix: Kmeans clustering

* Update resilience_routes.py

working both nodes and edges tabs,
remembering it was node tab or edge tab.

* update

converted html into template

* fix: Kclique clustering

* feat: resilience malicious integration

working resilience malicious

* feat: JS SCripts, copy node when clic

* feat: JS SCripts, copy node when clic

* feat: Custom dataset, BTC transactions

* fix: error write_html for dynamic

* feat: copy to clipboard node id

* Revert "Merge branch 'dev' of https://github.com/airscholar/AlphaTeam into tejas"

This reverts commit 50513b4, reversing
changes made to 8c67df5.

* Revert "feat: resilience malicious integration"

This reverts commit 8c67df5.

* Revert "Revert "feat: resilience malicious integration""

This reverts commit 4bc80c3.

* feat: working resilience

all resilience working

1 issue raised for cluster list issue

* update

operator bug fixed

* feat: Backend elevation to dev (#189)

---------

Co-authored-by: sferez <simeon.ferez@gmail.com>
Co-authored-by: Tejas Patil <tejas.coder@gmail.com>
Co-authored-by: Tejas Patil <65388565+tejas2292@users.noreply.github.com>
Co-authored-by: Simeon <91850099+sferez@users.noreply.github.com>
@airscholar airscholar deleted the yusuf branch May 2, 2023 05:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants