liuyu/qlib
1
0
Fork 0
mirror of https://github.com/microsoft/qlib.git synced 2026-07-12 15:26:54 +08:00
Code Activity

Resolve init conflict

Browse Source
This commit is contained in:
v-mingzhehan
2021-06-22 07:07:19 +00:00
parent d226ac8c32
commit 583fbbef3c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qlib/backtest/__init__.py
View File

@@ -7,15 +7,9 @@ from .exchange import Exchange
from .executor import BaseExecutor from .executor import BaseExecutor
from .backtest import backtest_loop from .backtest import backtest_loop
from .backtest import collect_data_loop from .backtest import collect_data_loop
<<<<<<< HEAD
from .order import Order from .order import Order
from .utils import CommonInfrastructure, TradeCalendarManager from .utils import CommonInfrastructure, TradeCalendarManager
=======
from .utils import CommonInfrastructure
from .order import Order
>>>>>>> ab97e8248443789ce1e0f90a9b5596e5fee60566
from ..strategy.base import BaseStrategy from ..strategy.base import BaseStrategy
from ..utils import init_instance_by_config from ..utils import init_instance_by_config
from ..log import get_module_logger from ..log import get_module_logger