diff --git a/.gitignore b/.gitignore
index 22fae02..d6b05c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,26 @@
*.jar
*.war
*.ear
+*.iml
+*.dat
+*.pdf
+*.eps
+*.aux
+*.log
+*.tex
+*.gnu
+*.sty
+*.txt
+*.sh
+*.feta
+*.dvi
+
#docs dir
docs
+out
+classes
+.idea
+bitcoin
+Mathematics__Betweenness_centrality
+experiments
+ipython-in-depth
\ No newline at end of file
diff --git a/README.md b/README.md
index a9cc255..8566af2 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,23 @@
FETA2
=====
-FETA2 java based graph analysis software (FETA 3 currently under development)
+FETA2 is a Java based graph analysis software (FETA 3 currently under development)
To build and run either:
+```
ant jar
+
java -jar feta2-1.0.0.jar [script.xml]
+```
or
+```
ant build
+
java feta.FetaCLI [script.xml]
+```
in the latter case you will need to set up CLASSPATH for java as shown below setting FETAHOME to whereever you placed the source. After you do this source ~/.bashrc
@@ -23,12 +29,13 @@ export CLASSPATH=${CLASSPATH}:${FETAHOME}:${FETAHOME}/libs/*
FetaCLI is controlled by a single XML document. This .XML controls what FETA is doing.
+```
- #Options related to graph data
- scripts/simple_test_graph.dat #File name
+ # Options related to graph data
+ scripts/simple_test_graph.dat # File name
NNT # Format
- true #Graph is directed
- false #Multiple links A->B allowed
+ true # Graph is directed
+ false # Multiple links A->B allowed
# Allowable data file formats
# NNT -- node-id(string) node-id(string) time (epoch)
@@ -38,3 +45,7 @@ FetaCLI is controlled by a single XML document. This .XML controls what FETA is
Measure
+```
+
+Documentation
+======
diff --git a/data/ASdatasets/as_grow.xml b/data/ASdatasets/as_grow.xml
new file mode 100644
index 0000000..05cd894
--- /dev/null
+++ b/data/ASdatasets/as_grow.xml
@@ -0,0 +1,44 @@
+
+
+ data/ASdatasets/ucla_base.txt
+ data/ASdatasets/ucla_art_pfp_rand.dat
+ NNT
+ false
+
+
+ Grow
+ 1072889100
+
+
+ false
+ feta.operationmodel.FromFile
+ data/ASdatasets/ucla.feta
+ ASCII
+
+
+ Link
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ 0.85
+
+
+ feta.objectmodel.RandomModelElement
+ 0.15
+
+
+
+ Node
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ 0.85
+
+
+ feta.objectmodel.RandomModelElement
+ 0.15
+
+
+
\ No newline at end of file
diff --git a/data/ASdatasets/as_measure.xml b/data/ASdatasets/as_measure.xml
new file mode 100644
index 0000000..f52e490
--- /dev/null
+++ b/data/ASdatasets/as_measure.xml
@@ -0,0 +1,14 @@
+
+
+ data/ASdatasets/route.txt
+ NNT
+ false
+
+
+ Measure
+ true
+ data/ASdatasets/route_real_degrees.txt
+ 19370880
+ 3000
+
+
diff --git a/data/ASdatasets/as_translate.xml b/data/ASdatasets/as_translate.xml
new file mode 100644
index 0000000..1b7d36c
--- /dev/null
+++ b/data/ASdatasets/as_translate.xml
@@ -0,0 +1,40 @@
+
+
+ data/ASdatasets/ucla.txt
+ NNT
+ true
+ false
+ data/ASdatasets/ucla.feta
+ ASCII
+
+
+ Translate
+ 1072889100
+
+
+
+ false
+ feta.operationmodel.FromFile
+ data/bitcoin/bitcoin_2009-2011.feta
+ ASCII
+
+
+ Link
+ false
+
+ feta.objectmodel.DegreeModelElement
+ 0.5
+
+
+
+ Node
+ false
+
+ feta.objectmodel.DegreeModelElement
+ 0.5
+
+
+
diff --git a/data/ASdatasets/routeviews_like.tmp b/data/ASdatasets/routeviews_like.tmp
new file mode 100644
index 0000000..0779e7c
--- /dev/null
+++ b/data/ASdatasets/routeviews_like.tmp
@@ -0,0 +1,40 @@
+
+
+ data/ASdatasets/route.txt
+ NNT
+ false
+
+
+ Likelihood
+ 1
+ 19370880
+
+
+
+
+ Link
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ 0.99
+
+
+ feta.objectmodel.RandomModelElement
+ .01
+
+
+
+ Node
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ 0.99
+
+
+ feta.objectmodel.RandomModelElement
+ .01
+
+
+
diff --git a/data/ASdatasets/routeviews_like.xml b/data/ASdatasets/routeviews_like.xml
new file mode 100644
index 0000000..db46eae
--- /dev/null
+++ b/data/ASdatasets/routeviews_like.xml
@@ -0,0 +1,40 @@
+
+
+ data/ASdatasets/route.txt
+ NNT
+ false
+
+
+ Likelihood
+ 1
+ 19370880
+
+
+
+
+ Link
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ AAA
+
+
+ feta.objectmodel.RandomModelElement
+ BBB
+
+
+
+ Node
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ AAA
+
+
+ feta.objectmodel.RandomModelElement
+ BBB
+
+
+
\ No newline at end of file
diff --git a/data/ASdatasets/ucla_like.tmp b/data/ASdatasets/ucla_like.tmp
new file mode 100644
index 0000000..bdd3158
--- /dev/null
+++ b/data/ASdatasets/ucla_like.tmp
@@ -0,0 +1,40 @@
+
+
+ data/ASdatasets/ucla.txt
+ NNT
+ false
+
+
+ Likelihood
+ 1
+ 1072889100
+
+
+
+
+ Link
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ 0.99
+
+
+ feta.objectmodel.RandomModelElement
+ .01
+
+
+
+ Node
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ 0.99
+
+
+ feta.objectmodel.RandomModelElement
+ .01
+
+
+
diff --git a/data/ASdatasets/ucla_like.xml b/data/ASdatasets/ucla_like.xml
new file mode 100644
index 0000000..7e89771
--- /dev/null
+++ b/data/ASdatasets/ucla_like.xml
@@ -0,0 +1,40 @@
+
+
+ data/ASdatasets/ucla.txt
+ NNT
+ false
+
+
+ Likelihood
+ 1
+ 1072889100
+
+
+
+
+ Link
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ AAA
+
+
+ feta.objectmodel.RandomModelElement
+ BBB
+
+
+
+ Node
+ false
+
+ feta.objectmodel.PFPModelElement
+ 0.048
+ AAA
+
+
+ feta.objectmodel.RandomModelElement
+ BBB
+
+
+
\ No newline at end of file
diff --git a/data/NetSci2018TwitterNetwork b/data/NetSci2018TwitterNetwork
new file mode 160000
index 0000000..a83211e
--- /dev/null
+++ b/data/NetSci2018TwitterNetwork
@@ -0,0 +1 @@
+Subproject commit a83211e25d361d86030b813fc005aeb78fe642c4
diff --git a/data/README b/data/README
index c6f1749..1f00dbd 100644
--- a/data/README
+++ b/data/README
@@ -11,8 +11,10 @@ facebook.dat -- data derived from Facebook likes data
Full original data at http://konect.uni-koblenz.de/networks/facebook-wosn-wall
+cit-HepPh.txt -- High energy theoretical physics citation network
+Full original data at http://snap.stanford.edu/data/cit-HepPh.html
+Associated files are cit-HepPh-dates.txt, and cit-HepPh-ordered.txt, generated by python file hep_ph_reorder.py (original dataset an unordered edgelist and a list of timestamps at which papers published)
-
-
+bitcoin_reorder.py and bitcoin_trimmer.py are used to reorder and trim the bitcoin transaction dataset, found at http://dynamics.cs.washington.edu/data.html
\ No newline at end of file
diff --git a/data/bitcoin_degrees.sh b/data/bitcoin_degrees.sh
new file mode 100755
index 0000000..131a03d
--- /dev/null
+++ b/data/bitcoin_degrees.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+bitdegrees=data/bitcoin/bitcoindegrees2009-2010.txt
+res1=data/bitcoin/bitsnap.dat
+
+awk '/./{line=$0} END{print line}' $bitdegrees > $res1
+awk '
+{
+ for (i=1; i<=NF; i++) {
+ a[NR,i] = $i
+ }
+}
+NF>p { p = NF }
+END {
+ for(j=1; j<=p; j++) {
+ str=a[1,j]
+ for(i=2; i<=NR; i++){
+ str=str" "a[i,j];
+ }
+ print str
+ }
+}' $res1 > data/bitcoin/bitcointransp.dat
\ No newline at end of file
diff --git a/data/bitcoin_reorder.py b/data/bitcoin_reorder.py
new file mode 100755
index 0000000..1830b6f
--- /dev/null
+++ b/data/bitcoin_reorder.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+file = 'data/bitcoin/bitcoin.links.csv'
+output = 'data/bitcoin/bitcoin_ordered.txt'
+
+unordered = []
+
+def takeThird(elem):
+ return elem[2]
+
+with open(file, 'r') as f:
+ for i, line in enumerate(f):
+ if i == 0:
+ continue
+ line = line.strip();
+ dststr, srcstr, count, date1str, date2str = line.split(',')
+ dst = int(dststr); src = int(srcstr); time = date1str.strip('"')
+ date, time = time.split('T')
+ arrival = int(date + time)
+ unordered.append([src, dst, arrival])
+ # if i>1000:
+ # break
+
+ordered = sorted(unordered, key = takeThird)
+
+with open(output,'w') as outfile:
+ for row in ordered:
+ outfile.write('%d %d %d \n' % (row[0], row[1], row[2]))
+ outfile.close()
\ No newline at end of file
diff --git a/data/bitcoin_trimmer.py b/data/bitcoin_trimmer.py
new file mode 100755
index 0000000..c027236
--- /dev/null
+++ b/data/bitcoin_trimmer.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+yearfrom = "2009"
+yearto = "2012"
+
+file1 = 'data/bitcoin/bitcoin_ordered.txt'
+file2 = 'data/bitcoin/bitcoin_'+yearfrom+'-'+yearto+'.txt'
+
+year1 = int(yearfrom + "0000000000")
+year2 = int(yearto + "0000000000")
+
+with open(file1,'r') as fread:
+ with open(file2,'w') as fwrite:
+ for i, line in enumerate(fread):
+ linestr = line.strip().split()
+ year = int(linestr[2])
+ if year < year1:
+ continue
+ if year >