Merge remote-tracking branch 'upstream/master'

Credits.txt

@@ -8,6 +8,7 @@ extensively by SNAP, was started by Marko Grobelnik in 1996.
 The following people also contributed to the development of SNAP
 (in alphabetical order).
 
+Ruth-Ann Armstrong
 Arijit Banerjee
 Austin Benson
 Justin Cheng
@@ -27,6 +28,7 @@ Vikesh Khanna
 Emmanouil Kiagias
 Myunghwan Kim
 Vid Kocijan
+Viswesh Krishna
 Saachi Jain
 Jason Jong
 Peter Lofgren
@@ -53,6 +55,7 @@ Ba-Quan Truong
 Utkarsh Upadhyay
 Theodore Vasiloudis
 Viswajith Venugopal
+Avery Wang
 Jaewon Yang
 Hao Yin
 David Zeng

Makefile.config

@@ -67,7 +67,7 @@ else ifeq ($(shell uname -o), Cygwin)
   CXXFLAGS += -Wall -D__STDC_LIMIT_MACROS
   CXXFLAGS += -O3 -DNDEBUG
   CXXOPENMP = -fopenmp
-  LDFLAGS +=
+  LDFLAGS += -fopenmp
   LIBS +=
 
 endif

Release.txt

@@ -5,6 +5,42 @@ performance system for graph and network manipulation and analysis.
 
 This file contains a high-level description of changes in SNAP releases.
 
+Release 6.0, Dec 4, 2020
+
+This is a major release, significant new functionality includes: a large family
+of egonet functions, dense and sparse floating-point vector attributes, graph
+union functions.
+
+Here is a detailed list:
+
+- implemented a large family of egonet functions GetEgonetHop(),
+  GetInEgonetHop(), GetOutEgonetHop(), GetInEgonetSub(), GetEgonetAttr(),
+  GetInEgonetAttr(), GetOutEgonetAttr(), GetInEgonetSubAttr()
+- implemented dense and sparse floating-point vector attributes for TNEANet
+- implemented graph union functions GetGraphUnion(), GetGraphUnionAttr()
+- implemented a new method TSnapQueue::Sample()
+- implemented AddNodeWithAttributes() and AddEdgeWithAttributes()
+- improved CommunityGirvanNewman(), so that the input graph is not modified
+- improved GetClustCf(), so that all output parameters are initialized
+- added dummy AddEdge(), IsEdge() methods with edge IDs to TUNGraph and
+  TNGraph classes for compatibility with TNEANet
+- changed the parameter names for GetClustCf(), which is needed for snap.py
+- updated the definition of gettimeofday() for compilation of snap.py with
+  python 3.5 and 3.6 on Windows
+- completed the implementation of aaMean policy in AggregateVector()
+- defined '/' operator for TStr, which is required in AggregateVector()
+- fixed the problem of GetStrVal() and AddRow() not being available in snap.py
+- fixed the handling of the random generator in GenDegSeq() and GenPrefAttach()
+- fixed a bug in edge attribute iterator in IntAttrValueEI()
+- fixed bugs in AddIntVAttrDatE(), AppendIntVAttrDatE()
+- fixed a few minor issues in the documentation
+- fixed compilation problems with TTable::GetStrVal()
+- improved parameters for OpenMP compilation on Cygwin and macOS
+- improved doxygen parameters and updated doxyblock.py for python3
+- updated Makefiles with $(HOME) references
+- updated Makefiles with additional instructions for building on Anaconda
+- updated graphviz baseline files for graphviz version 2.38.0
+
 Release 5.0, Aug 29, 2019
 
 This is a maintenance release and brings several upgrades.

doxygen/Doxyfile-dev

@@ -681,7 +681,7 @@ INPUT_ENCODING         = UTF-8
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
-FILE_PATTERNS          =
+FILE_PATTERNS          = *.h *.cpp
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.

doxygen/Doxyfile-user

@@ -681,7 +681,7 @@ INPUT_ENCODING         = UTF-8
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
-FILE_PATTERNS          =
+FILE_PATTERNS          = *.h *.cpp
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.

doxygen/doxyblock.py

@@ -78,10 +78,10 @@ def convert(dirpath,srcname,dstname):
     f.close()
 
 def insert(lines,bfile,bname):
-    #print "*** .%s. .%s." % (bfile, bname)
+    #print("*** .%s. .%s." % (bfile, bname))
 
     if not os.path.exists(bfile):
-        print "*** Error: file not found - file:.%s." % (bfile)
+        print("*** Error: file not found - file:.%s." % (bfile))
         sys.exit(1)
 
     f = open(bfile)
@@ -100,14 +100,14 @@ def insert(lines,bfile,bname):
 
         # get the label match
         blabel = words[1]
-        #print "+++ .%s. .%s." % (blabel, l)
+        #print("+++ .%s. .%s." % (blabel, l))
         if bname == blabel:
             found = True
             break
 
     if not found:
         f.close()
-        print "*** Error: block not found - file:.%s., block:.%s." % (bfile, bname)
+        print("*** Error: block not found - file:.%s., block:.%s." % (bfile, bname))
         sys.exit(1)
         return
 
@@ -128,7 +128,7 @@ def insert(lines,bfile,bname):
 if __name__ == '__main__':
 
     if len(sys.argv) < 3:
-        print "Usage: " + sys.argv[0] + " <srcdir> <dstdir>"
+        print("Usage: " + sys.argv[0] + " <srcdir> <dstdir>")
         sys.exit(1)
 
     srcdir = sys.argv[1]

glib-core/base.cpp

@@ -56,7 +56,7 @@ int _daylight = 0;
 #endif
 
 #if defined(WIN32_LEAN_AND_MEAN)
-int gettimeofday(struct timeval * tp, struct timezone * tzp)
+int gettimeofday(struct timeval *tp, void *tzp)
 {
     // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
     static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);

glib-core/base.h

@@ -81,7 +81,7 @@
 #if defined(WIN32_LEAN_AND_MEAN)
   #include <stdint.h>
 
-  int gettimeofday(struct timeval * tp, struct timezone * tzp);
+  int gettimeofday(struct timeval *tp, void *tzp);
 #endif
 
 // word size
@@ -139,6 +139,7 @@
 
 #ifdef GLib_CYGWIN
   #define timezone _timezone
+  #define _OPENMP
 #endif
 
 //#ifdef GLib_MACOSX

snap-core/doc/network.h.txt

@@ -319,7 +319,11 @@ Adds the key int value pair to the corresponding edge attribute value vector.
 ///
 
 /// TNEANet::AddIntVAttrDatE
-Adds the key intv value pair to the corresponding edge attribute value vector.
+Adds the key integer vector value pair to the corresponding edge attribute value vector.
+///
+
+/// TNEANet::AddFltVAttrDatE
+Adds the key float vector value pair to the corresponding edge attribute value vector.
 ///
 
 /// TNEANet::AddStrAttrDatE