diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml deleted file mode 100644 index 8f27ea5..0000000 --- a/.github/workflows/github-actions.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Building GPSClean -on: - push: - tags: - - '*' -jobs: - GPSClean-Release: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-latest, ubuntu-latest, windows-latest] - include: - - os: macos-latest - TARGET: gpsclean - DATA: '"model_42t_traces.h5:."' - - - os: ubuntu-latest - TARGET: gpsclean - DATA: '"model_42t_traces.h5:."' - - - os: windows-latest - TARGET: gpsclean.exe - DATA: '"model_42t_traces.h5;."' - steps: - - uses: actions/checkout@v2 - with: - lfs: 'true' - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.7' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Building - run: pyinstaller -F --add-data ${{matrix.DATA}} gpsclean.py - - uses: actions/upload-artifact@v2 - with: - name: gpsclean-${{matrix.os}} - path: dist/${{matrix.TARGET}} \ No newline at end of file diff --git a/setup.py b/setup.py index 1002dbd..7a4098d 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setuptools.setup( name="gpsclean", - version="0.4.0", + version="1.0.0", author="Davide Sbetti", author_email="davide.sbetti@gmail.com", description="An application to correct a GPS trace using machine learning techniques", diff --git a/src/gpsclean.egg-info/PKG-INFO b/src/gpsclean.egg-info/PKG-INFO index 61d71cf..e959362 100644 --- a/src/gpsclean.egg-info/PKG-INFO +++ b/src/gpsclean.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: gpsclean -Version: 0.4.0 +Version: 1.0.0 Summary: An application to correct a GPS trace using machine learning techniques Home-page: https://github.com/sbettid/GPSClean Author: Davide Sbetti diff --git a/src/gpsclean.egg-info/SOURCES.txt b/src/gpsclean.egg-info/SOURCES.txt index e296540..adede3e 100644 --- a/src/gpsclean.egg-info/SOURCES.txt +++ b/src/gpsclean.egg-info/SOURCES.txt @@ -13,4 +13,4 @@ src/gpsclean.egg-info/dependency_links.txt src/gpsclean.egg-info/entry_points.txt src/gpsclean.egg-info/requires.txt src/gpsclean.egg-info/top_level.txt -src/gpsclean/data/model_42t_traces.tflite \ No newline at end of file +src/gpsclean/data/model.tflite \ No newline at end of file diff --git a/src/gpsclean/data/model.tflite b/src/gpsclean/data/model.tflite new file mode 100644 index 0000000..569a8fd Binary files /dev/null and b/src/gpsclean/data/model.tflite differ diff --git a/src/gpsclean/data/model_42t_traces.tflite b/src/gpsclean/data/model_42t_traces.tflite deleted file mode 100644 index 4ab454f..0000000 Binary files a/src/gpsclean/data/model_42t_traces.tflite and /dev/null differ diff --git a/src/gpsclean/gpsclean.py b/src/gpsclean/gpsclean.py index 030681f..6ac16f2 100644 --- a/src/gpsclean/gpsclean.py +++ b/src/gpsclean/gpsclean.py @@ -19,7 +19,7 @@ import matplotlib #current version of the program -__VERSION__ = "0.4.0" +__VERSION__ = "1.0.0" def main(): @@ -69,7 +69,7 @@ def main(): #load the already trained model print("Loading the model...") dirPath = Path(__file__).absolute().parent - modelPath = dirPath.joinpath("data/model_42t_traces.tflite") + modelPath = dirPath.joinpath("data/model.tflite") interpreter = tflite.Interpreter(model_path=str(modelPath)) #predict the trace, creating segments using a window of 15 points and a step of 2 diff --git a/src/gpsclean/gpsclean.spec b/src/gpsclean/gpsclean.spec deleted file mode 100644 index 9e5fce9..0000000 --- a/src/gpsclean/gpsclean.spec +++ /dev/null @@ -1,40 +0,0 @@ -# -*- mode: python ; coding: utf-8 -*- - - -block_cipher = None - - -a = Analysis(['gpsclean.py'], - pathex=['C:\\Users\\Davide\\Documents\\unibz\\2_Master\\Tesi\\GPSClean_github\\GPSClean\\src\\gpsclean'], - binaries=[], - datas=[('data/model_42t_traces.tflite', 'data/')], - hiddenimports=[], - hookspath=[], - hooksconfig={}, - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - cipher=block_cipher, - noarchive=False) -pyz = PYZ(a.pure, a.zipped_data, - cipher=block_cipher) - -exe = EXE(pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - [], - name='gpsclean', - debug=False, - bootloader_ignore_signals=False, - strip=False, - upx=True, - upx_exclude=[], - runtime_tmpdir=None, - console=True, - disable_windowed_traceback=False, - target_arch=None, - codesign_identity=None, - entitlements_file=None )