diff --git a/MANIFEST b/MANIFEST index 3d908c5..a4ce5af 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,5 @@ # file GENERATED by distutils, do NOT edit +README setup.cfg setup.py pyFTS/__init__.py diff --git a/pyFTS/data/NASDAQ.py b/pyFTS/data/NASDAQ.py index 559259f..1ed36f9 100644 --- a/pyFTS/data/NASDAQ.py +++ b/pyFTS/data/NASDAQ.py @@ -11,7 +11,7 @@ def get_data(field): def get_dataframe(): dat = common.get_dataframe('data/NASDAQ.csv.bz2', - 'https://github.com/petroniocandido/pyFTS/raw/8f20f3634aa6a8f58083bdcd1bbf93795e6ed767/pyFTS/data/data/NASDAQ.csv.bz2', + 'https://github.com/petroniocandido/pyFTS/raw/8f20f3634aa6a8f58083bdcd1bbf93795e6ed767/pyFTS/data/NASDAQ.csv.bz2', sep=";", compression='bz2') return dat diff --git a/pyFTS/data/TAIEX.py b/pyFTS/data/TAIEX.py index 6d3bf38..37f6b0a 100644 --- a/pyFTS/data/TAIEX.py +++ b/pyFTS/data/TAIEX.py @@ -12,7 +12,7 @@ def get_data(): def get_dataframe(): dat = common.get_dataframe('data/TAIEX.csv.bz2', 'https://github.com/petroniocandido/pyFTS/raw/8f20f3634aa6a8f58083bdcd1bbf93795e6ed767/pyFTS/data/TAIEX.csv.bz2', - sep=";", compression='bz2') + sep=",", compression='bz2') dat["Date"] = pd.to_datetime(dat["Date"]) return dat diff --git a/pyFTS/notebooks/Severiano et al - HighOrderFTS.ipynb b/pyFTS/notebooks/Severiano et al - HighOrderFTS.ipynb index b6ecb67..3a03be6 100644 --- a/pyFTS/notebooks/Severiano et al - HighOrderFTS.ipynb +++ b/pyFTS/notebooks/Severiano et al - HighOrderFTS.ipynb @@ -18,9 +18,17 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "metadata": {}, "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "/usr/local/lib/python3.6/dist-packages/statsmodels/compat/pandas.py:56: FutureWarning: The pandas.core.datetools module is deprecated and will be removed in a future version. Please use the pandas.tseries module instead.\n", + " from pandas.core import datetools\n" + ] + }, { "name": "stdout", "output_type": "stream", @@ -58,13 +66,29 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 4, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "/home/petronio/dados/Dropbox/Doutorado/Codigos/pyFTSsource/pyFTS/notebooks/teste\n" + ] + } + ], "source": [ - "from pyFTS.data import Enrollments\n", + "#from pyFTS.data import Enrollments\n", "\n", - "enrollments = Enrollments.get_data()" + "#enrollments = Enrollments.get_data()\n", + "\n", + "import pandas as pd\n", + "import numpy as np\n", + "import os\n", + "import pkg_resources\n", + "from pathlib import Path\n", + "from urllib import request\n", + "\n" ] }, { diff --git a/setup.py b/setup.py index 64ed7d2..2a952a5 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,30 @@ from distutils.core import setup +from distutils.command.install import install as _install + + +class install(_install): + def run(self): + _install.run(self) + + from pyFTS.data import INMET,Enrollments,AirPassengers,NASDAQ,SONDA,SP500,sunspots,TAIEX + print("Downloading data assets:") + print("TAIEX") + TAIEX.get_data() + print("sunspots") + sunspots.get_data() + print("SP500") + SP500.get_dataframe() + print("SONDA") + SONDA.get_dataframe() + print("NASDAQ") + NASDAQ.get_dataframe() + print("AirPassengers") + AirPassengers.get_data() + print("Enrollments") + Enrollments.get_data() + print("INMET") + INMET.get_dataframe() + setup( name='pyFTS', @@ -9,7 +35,7 @@ setup( #package_data={'pyFTS.data': ['*.csv','*.csv.bz2']}, #data_files=[('data', ['pyFTS/data/Enrollments.csv', 'pyFTS/data/AirPassengers.csv'])], #include_package_data=True, - version='1.2.3', + version='1.2.0', description='Fuzzy Time Series for Python', author='Petronio Candido L. e Silva', author_email='petronio.candido@gmail.com', @@ -22,7 +48,5 @@ setup( 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', ], - #install_requires=[ - # 'numpy','pandas','matplotlib','dill','copy','dispy','multiprocessing','joblib','statsmodels' - #] + cmdclass={'install': install}, )