Skip to content

Commit df3a2dd

Browse files
removed
1 parent 58e7289 commit df3a2dd

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

precise/skaters/managers/schurmanagers.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
schur_diag_weak_pm_manager_factory, schur_vol_vol_ewa_manager_factory, schur_weak_vol_ewa_manager_factory, schur_diag_diag_ewa_manager_factory
33
from precise.skaters.managers.buyandholdfactory import buy_and_hold
44

5+
6+
USE_JS = False
7+
58
# gamma = 1.0
69
# r=0.025...
710

@@ -341,9 +344,13 @@ def schur_diag_weak_pm_t0_r050_n25_s5_g000_long_manager(y, s, k=1,e=1, j=1):
341344
SCHUR_J1_LONG_MANAGERS = SCHUR_GAMMA_100_LONG_MANAGERS + SCHUR_GAMMA_050_LONG_MANAGERS + SCHUR_GAMMA_010_LONG_MANAGERS + SCHUR_GAMMA_000_LONG_MANAGERS
342345
SCHUR_LS_MANAGERS = []
343346

344-
345-
SCHUR_J5_LONG_MANAGERS = [ buy_and_hold(mgr,j=5) for mgr in SCHUR_J1_LONG_MANAGERS ]
346-
SCHUR_J20_LONG_MANAGERS = [ buy_and_hold(mgr,j=20) for mgr in SCHUR_J1_LONG_MANAGERS ]
347+
# Remark: Functions not defined at top level don't always play nice with multiprocessing
348+
if USE_JS:
349+
SCHUR_J5_LONG_MANAGERS = [ buy_and_hold(mgr,j=5) for mgr in SCHUR_J1_LONG_MANAGERS ]
350+
SCHUR_J20_LONG_MANAGERS = [ buy_and_hold(mgr,j=20) for mgr in SCHUR_J1_LONG_MANAGERS ]
351+
else:
352+
SCHUR_J5_LONG_MANAGERS = []
353+
SCHUR_J20_LONG_MANAGERS = []
347354

348355
SCHUR_LONG_MANAGERS = SCHUR_J1_LONG_MANAGERS + SCHUR_J5_LONG_MANAGERS + SCHUR_J20_LONG_MANAGERS
349356

precise/skaters/managers/weakmanagers.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from precise.skaters.portfoliostatic.weakportfactory import BIG_H
44
from precise.skaters.managers.buyandholdfactory import buy_and_hold
55

6+
USE_JS = False
67

78
def weak_pm_t0_d0_r025_n50_long_manager(y, s, k=1, e=1):
89
assert k==1
@@ -107,7 +108,11 @@ def weak_sk_mcd_pcov_d0_n100_long_manager(y,s,k=1, e=1):
107108
weak_sk_mcd_pcov_d0_n100_long_manager
108109
]
109110

110-
WEAK_J5_LONG_MANAGERS = [ buy_and_hold(mgr,j=5) for mgr in WEAK_J1_LONG_MANAGERS ]
111-
WEAK_J20_LONG_MANAGERS = [ buy_and_hold(mgr,j=20) for mgr in WEAK_J1_LONG_MANAGERS ]
111+
if USE_JS:
112+
WEAK_J5_LONG_MANAGERS = [ buy_and_hold(mgr,j=5) for mgr in WEAK_J1_LONG_MANAGERS ]
113+
WEAK_J20_LONG_MANAGERS = [ buy_and_hold(mgr,j=20) for mgr in WEAK_J1_LONG_MANAGERS ]
114+
else:
115+
WEAK_J5_LONG_MANAGERS = []
116+
WEAK_J20_LONG_MANAGERS = []
112117

113118
WEAK_LONG_MANAGERS = WEAK_J1_LONG_MANAGERS+WEAK_J5_LONG_MANAGERS+WEAK_J20_LONG_MANAGERS

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setup(
99
name="precise",
10-
version="0.7.2",
10+
version="0.7.3",
1111
description="Online covariance, precision, portfolios and ensembles",
1212
long_description=README,
1313
long_description_content_type="text/markdown",

0 commit comments

Comments
 (0)