fix: Fix the bugs when importing gedlibpy.py.

Author: jajupmochi

gklearn/ged/median/test_median_graph_estimator.py

@@ -9,7 +9,7 @@
 def test_median_graph_estimator():
 	from gklearn.utils import load_dataset
 	from gklearn.ged.median import MedianGraphEstimator, constant_node_costs
-	from gklearn.gedlib import librariesImport, gedlibpy
+	from gklearn.gedlib import libraries_import, gedlibpy
 	from gklearn.preimage.utils import get_same_item_indices
 	import multiprocessing
 
@@ -83,7 +83,7 @@ def test_median_graph_estimator():
 def test_median_graph_estimator_symb():
 	from gklearn.utils import load_dataset
 	from gklearn.ged.median import MedianGraphEstimator, constant_node_costs
-	from gklearn.gedlib import librariesImport, gedlibpy
+	from gklearn.gedlib import libraries_import, gedlibpy
 	from gklearn.preimage.utils import get_same_item_indices
 	import multiprocessing
 

gklearn/ged/util/util.py

@@ -28,7 +28,7 @@ def compute_ged(g1, g2, options):
 		- # of edit operations are not computed in this method.
 
 	"""
-	from gklearn.gedlib import librariesImport, gedlibpy
+	from gklearn.gedlib import libraries_import, gedlibpy
 
 	ged_env = gedlibpy.GEDEnv()
 	ged_env.set_edit_cost(
@@ -375,7 +375,7 @@ def _compute_geds_without_permutation(
 	-----
 		- # of edit operations are computed in this method.
 	"""
-	from gklearn.gedlib import librariesImport, gedlibpy
+	from gklearn.gedlib import libraries_import, gedlibpy
 
 	# initialize ged env.
 	ged_env = gedlibpy.GEDEnv()
@@ -626,19 +626,25 @@ def get_nb_edit_operations(
 				g1, g2, forward_map, backward_map,
 				node_attrs=node_attrs, edge_attrs=edge_attrs
 			)
-		elif edit_cost == 'CONSTANT':
+		elif edit_cost in ['CONSTANT', 'CHEM_1', 'CHEM_2']:
 			node_labels = kwargs.get('node_labels', [])
 			edge_labels = kwargs.get('edge_labels', [])
 			return get_nb_edit_operations_symbolic(
 				g1, g2, forward_map, backward_map,
 				node_labels=node_labels, edge_labels=edge_labels
 			)
 		else:
-			return get_nb_edit_operations_symbolic(
-				g1, g2, forward_map,
-				backward_map
+			# The following edit costs include non-symbolic computations:
+			# 'CMU', 'GREC_1', 'GREC_2', 'FINGERPRINT', 'PROTEIN', 'GEOMETRIC'.
+			raise NotImplementedError(
+				f'`get_nb_edit_operations()` is not implemented for edit cost "{edit_cost}". '
 			)
 
+		# return get_nb_edit_operations_symbolic(
+		# 	g1, g2, forward_map,
+		# 	backward_map
+		# )
+
 
 def get_nb_edit_operations_symbolic(
 		g1, g2, forward_map, backward_map, node_labels=[], edge_labels=[]

gklearn/gedlib/__init__.py

@@ -6,5 +6,5 @@
 
 # info
 __version__ = "0.1"
-__author__  = "Linlin Jia"
-__date__    = "March 2020"
+__author__ = "Linlin Jia"
+__date__ = "March 2020"

gklearn/gedlib/gedlibpy_attr.pyx

@@ -706,15 +706,19 @@ cdef class GEDEnvAttr:
 					config_bool[key.encode('utf-8')] = value
 				else:
 					raise EditCostError(
-						"Edit cost configuration values must be either string or boolean."
+						'Edit cost configuration values must be either string or boolean.'
 					)
 
 			# # debug test only:
 			# print(f'[gedlibpy_attr.pyx] Edit cost config passed to C++ wrapper is {edit_cost_config}.')
-
-			self.c_env.setEditCost(
-				edit_cost_b, edit_cost_constant, config_str, config_bool
-			)
+			try:
+				self.c_env.setEditCost(
+					edit_cost_b, edit_cost_constant, config_str, config_bool
+				)
+			except Exception as e:
+				raise EditCostError(
+					f"Caught C++ Exception': {str(e)}."
+				)
 		else:
 			raise EditCostError(
 				"This edit cost function doesn't exist, please see list_of_edit_cost_options for selecting a edit cost function"