fix bug in include_interaction_list

Zebin Yang · Zebin Yang · commit 5557b2e2d5fa · 2022-04-20T18:54:00.000+08:00
diff --git a/dist/gaminet-0.5.7-py3-none-any.whl b/dist/gaminet-0.5.7-py3-none-any.whl
diff --git a/gaminet/__init__.py b/gaminet/__init__.py
@@ -2,5 +2,5 @@
 
 __all__ = ["GAMINet"]
 
-__version__ = '0.5.7'
+__version__ = '0.5.8'
 __author__ = 'Zebin Yang and Aijun Zhang'
diff --git a/gaminet/gaminet.py b/gaminet/gaminet.py
@@ -471,6 +471,12 @@ def add_interaction(self, tr_x, tr_y, val_x, val_y, sample_weight=None):
         self.interaction_list = list(set(self.include_interaction_list +
                              interaction_list_all[:self.interact_num - len(self.include_interaction_list)]))
         if self.interact_num - len(self.interaction_list) > 0:
+
+            self.interaction_list = list(set(self.interaction_list +
+                        interaction_list_all[self.interact_num - len(self.include_interaction_list):
+                        self.interact_num - len(self.include_interaction_list) +
+                        self.interact_num - len(self.interaction_list)]))
+
             self.interaction_list = self.interaction_list + interaction_list_all[self.interact_num:
                                      self.interact_num + self.interact_num - len(self.interaction_list)]
         self.interact_num_added = len(self.interaction_list)
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 }
 
 setup(name='gaminet',
-      version='0.5.7',
+      version='0.5.8',
       description='Explainable Neural Networks based on Generalized Additive Models with Structured Interactions',
       url='https://github.com/ZebinYang/GAMINet',
       author='Zebin Yang',

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`setup(name='gaminet',`
`13`		`- version='0.5.7',`
	`13`	`+ version='0.5.8',`
`14`	`14`	`description='Explainable Neural Networks based on Generalized Additive Models with Structured Interactions',`
`15`	`15`	`url='https://github.com/ZebinYang/GAMINet',`
`16`	`16`	`author='Zebin Yang',`