Merge pull request #62 from pnnl/v103

updating urls for data for tutorials
pnnl · Jun 26, 2021 · cbf2520 · cbf2520
2 parents fd3a889 + 42c4e97
commit cbf2520
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/docs/build/.doctrees/environment.pickle b/docs/build/.doctrees/environment.pickle
diff --git a/hypernetx/utils/toys/harrypotter.py b/hypernetx/utils/toys/harrypotter.py
@@ -16,12 +16,21 @@ class HarryPotter(object):
     def __init__(self, cols=None):
 
         # Read dataset in using pandas. Fix index column or use default pandas index.
+<<<<<<< HEAD
+        try:
+            fname = "https://raw.githubusercontent.com/pnnl/HyperNetX/master/hypernetx/utils/toys/HarryPotter_Characters.csv"
+            harrydata = pd.read_csv(fname, encoding="unicode_escape")
+        except:
+            fname = f'{current_dir}/HarryPotter_Characters.csv'
+            harrydata = pd.read_csv(fname, encoding="unicode_escape")
+=======
 #         try:
 #             fname = "HarryPotter_Characters.csv"
 #             harrydata = pd.read_csv(f'{current_dir}/{fname}', encoding="unicode_escape")
 #         except:
         fname = "https://raw.githubusercontent.com/pnnl/HyperNetX/master/hypernetx/utils/toys/HarryPotter_Characters.csv"
         harrydata = pd.read_csv(fname, encoding="unicode_escape")
+>>>>>>> master
         self.harrydata = pd.DataFrame(harrydata)
 
         # Choose string to fill NaN. These will be set to 0 in system id = sid

diff --git a/hypernetx/utils/toys/transmission_problem.py b/hypernetx/utils/toys/transmission_problem.py
@@ -4,15 +4,15 @@
 
 __all__ = ['TransmissionProblem']
 
-csvfile = 'ChungLuTransmissionData.csv'
-csvfile = os.path.join(os.path.dirname(__file__), csvfile)
+current_dir = os.path.dirname(os.path.abspath(__file__))
 
 
 class TransmissionProblem(object):
-    def __init__(self, csvfile=csvfile):
-        csvfile = csvfile
+    def __init__(self):
+
         try:
+            csvfile = "https://raw.githubusercontent.com/pnnl/HyperNetX/master/hypernetx/utils/toys/ChungLuTransmissionData.csv"
             self.df = pd.read_csv(csvfile, header=None, names=['receivers', 'senders'])
         except:
-            fname = "https://raw.githubusercontent.com/pnnl/HyperNetX/master/hypernetx/utils/toys/ChungLuTransmissionData.csv"
-            self.df = pd.read_csv(fname, header=None, names=['receivers', 'senders'])
+            csvfile = f'{current_dir}/ChungLuTransmissionData.csv'
+            self.df = pd.read_csv(csvfile, header=None, names=['receivers', 'senders'])
diff --git a/tutorials/Tutorial 6 - Static Hypergraphs and Entities.ipynb b/tutorials/Tutorial 6 - Static Hypergraphs and Entities.ipynb