Commits · master · Miles Lucas / Space Junk

07 Apr, 2019 40 commits
- Merge branch 'master' of git.linux.iastate.edu:cs-gso_hackathon2019/Grobs · 2ed5839b
  Miles Lucas authored Apr 07, 2019
  
  2ed5839b
- typo in about.html · c34b38e2
  Miles Lucas authored Apr 07, 2019
  
  c34b38e2
- Updated source data. · 56f60d9e
  Andrew Chatman authored Apr 07, 2019
  
  56f60d9e
- updated opacities · e934f686
  Miles Lucas authored Apr 07, 2019
  
  e934f686
- fixed merge issues · ba07f0ee
  Miles Lucas authored Apr 07, 2019
  
  ba07f0ee
- added to about page · 52818296
  Miles Lucas authored Apr 07, 2019
  
  52818296
- Merge branch 'astrodynamics' into 'master' · 47a8b69e
  Andrew Chatman authored Apr 07, 2019
```
Astrodynamics

See merge request cs-gso_hackathon2019/grobs!3
```
  47a8b69e
- Fixed pkl file. · 7bcc09fd
  Andrew Chatman authored Apr 07, 2019
  
  7bcc09fd
- Merge remote-tracking branch 'origin/master' into astrodynamics · 0fb14812
  Andrew Chatman authored Apr 07, 2019
  
  0fb14812
- Added catalog column · d59ecb92
  Andrew Chatman authored Apr 07, 2019
  
  d59ecb92
- spacejunk/astro_calc.py · 6b57cf9c
  Andrew Chatman authored Apr 07, 2019
  
  6b57cf9c
- added random text chioces · 0d12eae9
  Miles Lucas authored Apr 07, 2019
  
  0d12eae9
- reverted to old procfile style · cff5e830
  Miles Lucas authored Apr 07, 2019
  
  cff5e830
- fixed import issues in astro_calc script · 265d8028
  Miles Lucas authored Apr 07, 2019
  
  265d8028
- fixed typo · 8015b96c
  Miles Lucas authored Apr 07, 2019
  
  8015b96c
- put data filename into a config var for consistency · e8c52f4c
  Miles Lucas authored Apr 07, 2019
  
  e8c52f4c
- updated procfile · 747bba3d
  Miles Lucas authored Apr 07, 2019
  
  747bba3d
- put data transform into release step · b85a8110
  Miles Lucas authored Apr 07, 2019
  
  b85a8110
- Merge branch 'develop' into 'master' · e2b270ea
  Andrew Chatman authored Apr 07, 2019
```
Develop

See merge request cs-gso_hackathon2019/grobs!1
```
  e2b270ea
- Lat calculation now uses arctan2. · 77fd5376
  Andrew Chatman authored Apr 07, 2019
  
  77fd5376
- Merge remote-tracking branch 'origin/develop' into astrodynamics · 4b6cc51f
  Andrew Chatman authored Apr 07, 2019
```
# Conflicts:
#	spacejunk/astro_calc.py
```
  4b6cc51f
- tidied up histograms and lowered danger level · 97c5ff9c
  Miles Lucas authored Apr 07, 2019
  
  97c5ff9c
- added histograms · aa5a522f
  Miles Lucas authored Apr 07, 2019
  
  aa5a522f
- screw it max danger · 27b4a187
  Miles Lucas authored Apr 07, 2019
  
  27b4a187
- upping the danger level · 3a3eaf3c
  Miles Lucas authored Apr 07, 2019
  
  3a3eaf3c
- skip broken test · 52be4f0f
  Miles Lucas authored Apr 07, 2019
  
  52be4f0f
- added hack for legend · 04a2325b
  Miles Lucas authored Apr 07, 2019
  
  04a2325b
- switched to proper epsilon · 34ea53af
  Miles Lucas authored Apr 07, 2019
  
  34ea53af
- okay formatting · f1c469a7
  Miles Lucas authored Apr 07, 2019
  
  f1c469a7
- cleaner commas · 44a40e57
  Miles Lucas authored Apr 07, 2019
  
  44a40e57
- added commas · 18d66301
  Miles Lucas authored Apr 07, 2019
  
  18d66301
- style update · d600085c
  Miles Lucas authored Apr 07, 2019
  
  d600085c
- looser constraints · 0e4e9a2c
  Miles Lucas authored Apr 07, 2019
  
  0e4e9a2c
- added dumb lottery measure · 38d832c3
  Miles Lucas authored Apr 07, 2019
  
  38d832c3
- loosened prob calcs · 98152891
  Miles Lucas authored Apr 07, 2019
  
  98152891
- typo · 246ae1d6
  Miles Lucas authored Apr 07, 2019
  
  246ae1d6
- typo in js · 114b9948
  Miles Lucas authored Apr 07, 2019
  
  114b9948
- fixed calculation · c74b688b
  Miles Lucas authored Apr 07, 2019
  
  c74b688b
- changed to use odds ratio · 24739226
  Miles Lucas authored Apr 07, 2019
  
  24739226
- dummy change for probability.js · a34ee6b3
  Miles Lucas authored Apr 07, 2019
  
  a34ee6b3