Flatten Cython includes.

gambitproject · Sep 4, 2023 · 1968f42 · 1968f42
1 parent 3c555e6
commit 1968f42
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 17 deletions.
diff --git a/src/pygambit/core/action.pxi → src/pygambit/action.pxi b/src/pygambit/core/action.pxi → src/pygambit/action.pxi
diff --git a/src/pygambit/core/behav.pxi → src/pygambit/behav.pxi b/src/pygambit/core/behav.pxi → src/pygambit/behav.pxi
diff --git a/src/pygambit/gambit.pxd b/src/pygambit/gambit.pxd
@@ -474,3 +474,8 @@ cdef extern from "tools/logit/nfglogit.h":
                                                   c_MixedStrategyProfileDouble,
                                                   double, double, double) except +RuntimeError
 
+cdef extern from "nash.h":
+    c_LogitQREMixedStrategyProfile *_logit_estimate "logit_estimate"(c_MixedStrategyProfileDouble *)
+    c_LogitQREMixedStrategyProfile *_logit_atlambda "logit_atlambda"(c_Game, double)
+    c_List[c_LogitQREMixedStrategyProfile] _logit_principal_branch "logit_principal_branch"(c_Game, double)
+
diff --git a/src/pygambit/gambit.pyx b/src/pygambit/gambit.pyx
@@ -97,14 +97,14 @@ class Collection:
 # Includes
 ######################
 
-include "core/action.pxi"
-include "core/infoset.pxi"
-include "core/strategy.pxi"
-include "core/player.pxi"
-include "core/outcome.pxi"
-include "core/node.pxi"
-include "core/stratspt.pxi"
-include "core/mixed.pxi"
-include "core/behav.pxi"
-include "core/game.pxi"
-include "core/nash.pxi"
+include "action.pxi"
+include "infoset.pxi"
+include "strategy.pxi"
+include "player.pxi"
+include "outcome.pxi"
+include "node.pxi"
+include "stratspt.pxi"
+include "mixed.pxi"
+include "behav.pxi"
+include "game.pxi"
+include "nash.pxi"
diff --git a/src/pygambit/core/game.pxi → src/pygambit/game.pxi b/src/pygambit/core/game.pxi → src/pygambit/game.pxi
diff --git a/src/pygambit/core/infoset.pxi → src/pygambit/infoset.pxi b/src/pygambit/core/infoset.pxi → src/pygambit/infoset.pxi
diff --git a/src/pygambit/core/mixed.pxi → src/pygambit/mixed.pxi b/src/pygambit/core/mixed.pxi → src/pygambit/mixed.pxi
diff --git a/src/pygambit/core/nash.h → src/pygambit/nash.h b/src/pygambit/core/nash.h → src/pygambit/nash.h
diff --git a/src/pygambit/core/nash.pxi → src/pygambit/nash.pxi b/src/pygambit/core/nash.pxi → src/pygambit/nash.pxi
@@ -368,12 +368,6 @@ cdef class GNMStrategySolver:
         return ret
 
 
-cdef extern from "nash.h":
-    c_LogitQREMixedStrategyProfile *_logit_estimate "logit_estimate"(c_MixedStrategyProfileDouble *)
-    c_LogitQREMixedStrategyProfile *_logit_atlambda "logit_atlambda"(c_Game, double)
-    c_List[c_LogitQREMixedStrategyProfile] _logit_principal_branch "logit_principal_branch"(c_Game, double)
-
-
 cdef class LogitQREMixedStrategyProfile:
     cdef c_LogitQREMixedStrategyProfile *thisptr
     def __init__(self, game=None):

diff --git a/src/pygambit/core/node.pxi → src/pygambit/node.pxi b/src/pygambit/core/node.pxi → src/pygambit/node.pxi
diff --git a/src/pygambit/core/outcome.pxi → src/pygambit/outcome.pxi b/src/pygambit/core/outcome.pxi → src/pygambit/outcome.pxi
diff --git a/src/pygambit/core/player.pxi → src/pygambit/player.pxi b/src/pygambit/core/player.pxi → src/pygambit/player.pxi
diff --git a/src/pygambit/core/strategy.pxi → src/pygambit/strategy.pxi b/src/pygambit/core/strategy.pxi → src/pygambit/strategy.pxi
diff --git a/src/pygambit/core/stratspt.pxi → src/pygambit/stratspt.pxi b/src/pygambit/core/stratspt.pxi → src/pygambit/stratspt.pxi
diff --git a/src/pygambit/core/util.h → src/pygambit/util.h b/src/pygambit/core/util.h → src/pygambit/util.h