fix bug wrt include_interaction_list; v0.5.7

Zebin Yang · Zebin Yang · commit fb6f92330d88 · 2022-04-13T23:57:03.000+08:00
diff --git a/examples/GAMINet-demo.ipynb b/examples/GAMINet-demo.ipynb
@@ -2248,9 +2248,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "py37",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "py37"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -2262,7 +2262,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.7"
+   "version": "3.8.8"
   },
   "latex_envs": {
    "LaTeX_envs_menu_present": true,
diff --git a/gaminet/gaminet.py b/gaminet/gaminet.py
@@ -469,7 +469,10 @@ def add_interaction(self, tr_x, tr_y, val_x, val_y, sample_weight=None):
                           active_main_effect_index=np.arange(self.input_num))
 
         self.interaction_list = list(set(self.include_interaction_list +
-                            interaction_list_all[:(self.interact_num - len(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 = 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)
         self.interact_blocks.set_interaction_list(self.interaction_list)
         self.output_layer.set_interaction_list(self.interaction_list)
