@@ -202,9 +202,9 @@ def excel(self):
202
202
'knotinfo_data_complete.xls'
203
203
"""
204
204
if self == KnotInfoFilename .knots :
205
- return '%s.xls' % (self .value [1 ])
205
+ return '%s.xls' % (self .value [1 ])
206
206
else :
207
- return '%s.xlsx' % (self .value [1 ])
207
+ return '%s.xlsx' % (self .value [1 ])
208
208
209
209
def csv (self ):
210
210
r"""
@@ -218,7 +218,7 @@ def csv(self):
218
218
sage: ki_db.filename.knots.csv()
219
219
'knotinfo_data_complete.csv'
220
220
"""
221
- return '%s.csv' % (self .value [1 ])
221
+ return '%s.csv' % (self .value [1 ])
222
222
223
223
def num_knots (self , version ):
224
224
r"""
@@ -232,7 +232,7 @@ def num_knots(self, version):
232
232
sage: ki_db.filename.knots.num_knots('21.7')
233
233
'num_knots_21.7.sobj'
234
234
"""
235
- return 'num_knots_%s.sobj' % version
235
+ return 'num_knots_%s.sobj' % version
236
236
237
237
def sobj_row (self ):
238
238
r"""
@@ -275,9 +275,9 @@ def sobj_data(self, column):
275
275
'knotinfo_braid_notation'
276
276
"""
277
277
if column .column_type () == column .types .OnlyLinks :
278
- return 'linkinfo_%s' % (column .name )
278
+ return 'linkinfo_%s' % (column .name )
279
279
else :
280
- return 'knotinfo_%s' % (column .name )
280
+ return 'knotinfo_%s' % (column .name )
281
281
282
282
def description_url (self , column ):
283
283
r"""
@@ -290,7 +290,7 @@ def description_url(self, column):
290
290
sage: ki_db.filename.knots.description_url(ki_db.columns().braid_notation)
291
291
'https://knotinfo.math.indiana.edu/descriptions/braid_notation.html'
292
292
"""
293
- return '%sdescriptions/%s.html' % (self .url (), column .name )
293
+ return '%sdescriptions/%s.html' % (self .url (), column .name )
294
294
295
295
def diagram_url (self , fname , single = False ):
296
296
r"""
@@ -306,9 +306,9 @@ def diagram_url(self, fname, single=False):
306
306
'https://knotinfo.math.indiana.edu/diagrams/3_1'
307
307
"""
308
308
if single :
309
- return '%sdiagrams/%s' % (self .url (), fname )
309
+ return '%sdiagrams/%s' % (self .url (), fname )
310
310
else :
311
- return '%sdiagram_display.php?%s' % (self .url (), fname )
311
+ return '%sdiagram_display.php?%s' % (self .url (), fname )
312
312
313
313
knots = ['https://knotinfo.math.indiana.edu/' , 'knotinfo_data_complete' ]
314
314
links = ['https://linkinfo.sitehost.iu.edu/' , 'linkinfo_data_complete' ]
@@ -457,7 +457,7 @@ def demo_version(self):
457
457
self ._demo = False
458
458
else :
459
459
self ._demo = True
460
- self ._num_knots = len ([v for v in row_demo_sample .values () if v [1 ]== 1 ])
460
+ self ._num_knots = len ([v for v in row_demo_sample .values () if v [1 ] == 1 ])
461
461
return self ._demo
462
462
463
463
def knot_list (self ):
@@ -548,7 +548,7 @@ def _create_col_dict_sobj(self, sobj_path=None):
548
548
col_type = KnotInfoColumnTypes .OnlyLinks
549
549
column_dict [col ] = [name , col_type ]
550
550
551
- save (column_dict , '%s/%s' % (sobj_path , self .filename .knots .sobj_column ()))
551
+ save (column_dict , '%s/%s' % (sobj_path , self .filename .knots .sobj_column ()))
552
552
553
553
def _create_data_sobj (self , sobj_path = None ):
554
554
r"""
@@ -582,7 +582,7 @@ def _create_data_sobj(self, sobj_path=None):
582
582
# ----------------------------------------------------------------
583
583
# Columns that exist for knots and links
584
584
# ----------------------------------------------------------------
585
- column_dict = load ('%s/%s' % (sobj_path , self .filename .knots .sobj_column ()))
585
+ column_dict = load ('%s/%s' % (sobj_path , self .filename .knots .sobj_column ()))
586
586
cols = KnotInfoColumns ('ColsTemp' , column_dict )
587
587
for col in cols :
588
588
val_list = []
@@ -608,9 +608,9 @@ def _create_data_sobj(self, sobj_path=None):
608
608
val_list .append (link_list [i ][col .name ])
609
609
610
610
if val_list :
611
- save (val_list , '%s/%s' % (sobj_path , self .filename .knots .sobj_data (col )))
611
+ save (val_list , '%s/%s' % (sobj_path , self .filename .knots .sobj_data (col )))
612
612
613
- save (row_dict , '%s/%s' % (sobj_path , self .filename .knots .sobj_row ()))
613
+ save (row_dict , '%s/%s' % (sobj_path , self .filename .knots .sobj_row ()))
614
614
615
615
@cached_method
616
616
def columns (self ):
@@ -652,7 +652,7 @@ def read_column_dict(self):
652
652
return column_demo_sample
653
653
sobj_path = self ._sobj_path
654
654
filename = self .filename .knots .sobj_column ()
655
- return load ('%s/%s' % (sobj_path , filename ))
655
+ return load ('%s/%s' % (sobj_path , filename ))
656
656
657
657
# -------------------------------------------------------------------------------------------------------------
658
658
# read the dictionary for the row names that is the knot and link names from sobj-file
@@ -680,7 +680,7 @@ def read_row_dict(self):
680
680
return row_demo_sample
681
681
sobj_path = self ._sobj_path
682
682
filename = self .filename .knots .sobj_row ()
683
- return load ('%s/%s' % (sobj_path , filename ))
683
+ return load ('%s/%s' % (sobj_path , filename ))
684
684
685
685
# -------------------------------------------------------------------------------------------------------------
686
686
# return a dictionary to obtain the original name to a row_dict key
@@ -752,7 +752,7 @@ def read(self, column):
752
752
sage: ki_db = KnotInfoDataBase()
753
753
"""
754
754
if not isinstance (column , KnotInfoColumns ):
755
- raise TypeError ('column must be an instance of enum %s' % (KnotInfoColumns ))
755
+ raise TypeError ('column must be an instance of enum %s' % (KnotInfoColumns ))
756
756
757
757
if self .demo_version ():
758
758
return data_demo_sample [column ]
@@ -763,8 +763,8 @@ def read(self, column):
763
763
else :
764
764
filename = self .filename .knots .sobj_data (column )
765
765
766
- verbose ('loading data library %s ...' % (filename ))
767
- res = load ('%s/%s' % (sobj_path , filename ))
766
+ verbose ('loading data library %s ...' % (filename ))
767
+ res = load ('%s/%s' % (sobj_path , filename ))
768
768
verbose ('... finished!' )
769
769
770
770
return res
0 commit comments