Commit f08f604

committed

Merge branch 'development'

Conflicts: propinquity/src/main/java/pdgs/propinquitydynamics/App.java propinquity/src/main/java/pdgs/propinquitydynamics/PropinquityDynamics.j ava propinquity/src/main/java/pdgs/utils/Utils.java

2 parents cfa1b62 + a7b52d6 commit f08f604Copy full SHA for f08f604

15 files changed

+1168

-134

lines changed

.gitignore
data
louvain
- nbactions.xml
- src/main/java
  - gsalgos
    - App.java
  - org/graphstream/algorithm/community
propinquity
- nbactions.xml
- src/main/java/pdgs
  - examples
    - Example.java
  - propinquitydynamics
    - App.java
    - PropinquityDynamics.java
  - utils
    - Unused.java
    - Utils.java

15 files changed

+1168

-134

lines changed

`‎.gitignore‎`

-Original file line number
+Diff line change
 *.war
 *.ear
 -.netbeans_automatic_build
 +.netbeans_automatic_build
 +data/export.gml

Comments

(0)