Skip to content
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

Added final changes to scales.h and testing for scales.h #337

Merged
merged 52 commits into from
Jul 21, 2020
Merged

Added final changes to scales.h and testing for scales.h #337

Changes from 6 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
19ca52d
added SequentialOrDivergingScale class, cleaned up tests
Oliver-BE Jun 25, 2020
a0e2a0e
added getters, organized new scales
Oliver-BE Jun 25, 2020
4bd40fa
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jun 29, 2020
8250ac4
added push_map_to_javascript functionality
Oliver-BE Jun 29, 2020
ba9c6ae
made base class constructors protected
Oliver-BE Jun 29, 2020
3d69467
added template specialization to ApplyScale
Oliver-BE Jun 30, 2020
f6b7290
fixes to pass_map_to_javascript
Oliver-BE Jun 30, 2020
832bc23
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jul 1, 2020
88f41a6
cleaned up pass_map_to_javascript
Oliver-BE Jul 1, 2020
2750f87
fixed apply scale date
Oliver-BE Jul 2, 2020
a4d0df5
fixed ApplyScale for Date input
Oliver-BE Jul 7, 2020
6e6106b
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jul 7, 2020
8864f62
created working scale tests and started testing linear scale
Oliver-BE Jul 7, 2020
ebc36ed
added working tests for linear and pow scale
Oliver-BE Jul 8, 2020
603eeae
added passing tests for sqrt, log, and symlog scales
Oliver-BE Jul 9, 2020
fb45fd4
added passing tests for identity scale and time scale. cleaned up som…
Oliver-BE Jul 10, 2020
bbfe82c
Add Dockerfile
mmore500 Jul 11, 2020
9dbe79a
Advertise Docker container on README.md
mmore500 Jul 11, 2020
335644c
Entrypoint should be path to script
mmore500 Jul 11, 2020
49da5b8
Fixup formatting
mmore500 Jul 11, 2020
ae4a9cf
Initialize git submodules for DockerHub
mmore500 Jul 11, 2020
9911efa
Try separating submodule init and update
mmore500 Jul 11, 2020
1bdd295
Try nuking and then reininitializing submodules
mmore500 Jul 11, 2020
712ac43
Escape #'s in scripts
mmore500 Jul 11, 2020
a036443
Separate submodule init, install test deps
mmore500 Jul 11, 2020
b22fb33
More selectively remove cached files
mmore500 Jul 11, 2020
9be97c4
Try a better way to clear submodules
mmore500 Jul 11, 2020
675028d
Try adding -f flag to update
mmore500 Jul 11, 2020
097cc95
Re-fix shebangs
mmore500 Jul 11, 2020
4356305
Remove mysterious set -e line
mmore500 Jul 11, 2020
3654f76
Add -f flag to submodule deinit
mmore500 Jul 11, 2020
7cdb2d4
Revert "Remove mysterious set -e line"
mmore500 Jul 11, 2020
7cf8c3b
Remove default command
mmore500 Jul 11, 2020
6142620
Fixup entrypoint
mmore500 Jul 11, 2020
d2070d7
Merge pull request #331 from devosoft/docker
mmore500 Jul 13, 2020
06249e2
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jul 13, 2020
40f3e4f
Merge branch 'master' into d3-wrapper-dev-oliver
Oliver-BE Jul 14, 2020
afe156e
Switch from ssh to https ref to origin
mmore500 Jul 14, 2020
1fbdfde
Fixup Dockerfile
mmore500 Jul 14, 2020
47e8875
added file that demonstrates core functionality of writing emscripten…
Oliver-BE Jul 14, 2020
cb29bcd
Merge pull request #332 from devosoft/mmore500-patch-docker
mmore500 Jul 14, 2020
81d5993
Install karma-firefox-launcher
mmore500 Jul 15, 2020
490f73e
Merge pull request #333 from devosoft/mmore500-dockerfile-windows
mmore500 Jul 15, 2020
2781fa7
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jul 15, 2020
de11e53
added blogpost rough draft file
Oliver-BE Jul 15, 2020
7f062b4
added remaining tests, fixed small bugs in scales.h
Oliver-BE Jul 21, 2020
e6f0de0
Merge branch 'master' into d3-wrapper-dev-oliver
Oliver-BE Jul 21, 2020
6be9019
fixed comments and spacing
Oliver-BE Jul 21, 2020
8b24450
removing file
Oliver-BE Jul 21, 2020
8d64538
removing enrichment.cc
Oliver-BE Jul 21, 2020
b6a48a0
Merge branch 'd3-wrapper' into d3-wrapper-dev-oliver
Oliver-BE Jul 21, 2020
98e7075
removing test_scales.cc
Oliver-BE Jul 21, 2020
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
22 changes: 22 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ RUN \
&& \
echo "installed test dependencies"

RUN \
cd /opt/Empirical \
&& \
git remote set-url origin https://github.com/devosoft/Empirical.git \
&& \
echo "switched to https origin remote url"

RUN \
/etc/init.d/xvfb start \
&& \
Expand Down Expand Up @@ -190,3 +197,18 @@ RUN \
ENTRYPOINT ["/opt/entrypoint.sh"]

CMD ["bash"]

# Adapted from https://github.com/karma-runner/karma-firefox-launcher/issues/93#issuecomment-519333245
# Maybe important for container compatability running on Windows?
RUN \
cd /opt/ \
&& \
npm install -g yarn \
&& \
git clone https://github.com/karma-runner/karma-firefox-launcher.git \
&& \
cd karma-firefox-launcher \
&& \
yarn install \
&& \
echo "installed karma-firefox-launcher"