Skip to content

Full refactor #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sorrento110 wants to merge 15 commits into
base: dev
Choose a base branch
from
Open

Full refactor #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
83c25c9
Start refactoring code into separate modules, got tests running in do…
Sorrento110 Dec 23, 2022
4ccd262
General clean up continued, Docker improved, tests running in docker …
Sorrento110 Jan 6, 2023
895f31b
Readability changes, normalizer improvements
Sorrento110 Jan 6, 2023
67bb25b
Breaking up files more, more improvements
Sorrento110 Jan 6, 2023
848302e
Updated refactor, WIP on time conversion code
Sorrento110 Jan 9, 2023
367f26e
Renamed 0 to 1 scaling, added entrypoint from main file to access fea…
Sorrento110 Jan 17, 2023
1e4a7c6
Changes to enable the 0 to 1 feature scaling to be used in dojo-stack.
Sorrento110 Jan 17, 2023
b51e11a
WIP almost complete time refactor.
Sorrento110 Jan 23, 2023
37251e4
Continued WIP, removed time conversion in favor of my simplified vers…
Sorrento110 Jan 30, 2023
9afd840
Added clipping transformation code and job, main flow still broken.
Sorrento110 Feb 1, 2023
a799bc7
Bugfixes to clipping transformation.
Sorrento110 Feb 3, 2023
4131d18
WIP main standardization time flow almost without assertion errors on…
Sorrento110 Feb 3, 2023
1759fe0
3 more transformations added, general improvements to main flow.
Sorrento110 Feb 7, 2023
308ac31
Added function to get boundary for UI
Sorrento110 Feb 8, 2023
445c25a
transformation upgrades, additional cleanup of normalization flow.
Sorrento110 Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 21 additions & 23 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
FROM ubuntu:20.04
RUN apt-get update && \
apt-get -y install sudo
RUN apt-get install -y software-properties-common
RUN apt-get update
RUN apt-get update && apt-get install -y \
software-properties-common \
sudo \
unzip \
wget

RUN apt-get install wget unzip
RUN wget https://jataware-world-modelers.s3.amazonaws.com/gadm/gadm36_2.feather.zip
RUN wget https://jataware-world-modelers.s3.amazonaws.com/gadm/gadm36_3.feather.zip
RUN mkdir ~/mixmasta_data && \
RUN wget https://jataware-world-modelers.s3.amazonaws.com/gadm/gadm36_2.feather.zip && \
wget https://jataware-world-modelers.s3.amazonaws.com/gadm/gadm36_3.feather.zip && \
mkdir ~/mixmasta_data && \
unzip gadm36_2.feather.zip -d ~/mixmasta_data/ && \
unzip gadm36_3.feather.zip -d ~/mixmasta_data/ && \
rm gadm36_?.feather.zip

RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable
RUN apt-get update
RUN apt-get install -y python3.8-dev
RUN apt-get install -y gdal-bin
RUN apt-get install -y libgdal-dev
RUN apt-get install -y python3-pip
RUN apt install -y python3-rtree
RUN add-apt-repository ppa:ubuntugis/ubuntugis-unstable && apt-get update && \
apt-get install -y \
gdal-bin \
libgdal-dev \
python3-pip \
python3-rtree \
python3.8-dev && \
apt-get -y autoremove && apt-get clean autoclean

ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
ENV C_INCLUDE_PATH=/usr/include/gdal

RUN pip3 install numpy==1.22
COPY . /mixmasta

WORKDIR /
COPY requirements.txt /requirements.txt
RUN pip3 install -r requirements.txt
COPY . /
RUN python3 setup.py install
#RUN mixmasta download
WORKDIR /mixmasta

ENTRYPOINT ["mixmasta"]
RUN pip3 install numpy==1.22 && \
pip3 install -r requirements.txt && \
python3 setup.py install
8 changes: 8 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: "3.9"
services:
mixmasta:
container_name: mixmasta-container
command: tail -f /dev/null #Keeps container up on start, no other function
build: ./
volumes:
- $PWD:/mixmasta
Loading