merged with Tomas branch
Description
Description
Details
Details
- Committed
Tomas Erland Turner <tomas.turner@epfl.ch> May 19 2020, 14:57 - Pushed
pulver May 29 2020, 11:32 - Parents
- R10546:b8034a6e1525: fixed merged conflict on requirements
R10546:324af65b14eb: add distribution pickle through LFS - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b8034a6e1525 | Tomas Erland Turner | fixed merged conflict on requirements | May 19 2020 | |||
| fcf8b2483a6b | Tomas Erland Turner | deleted unnecessary bash norebook and alex's notebook | May 19 2020 | |||
| 358c9a5a4fc8 | Tomas Erland Turner | changed order array and added markdown with paths to array | May 19 2020 | |||
| 372be05c9231 | Tomas Erland Turner | finished data structures: added none in times, route_int and stop:int, deleted… | May 16 2020 | |||
| 9d8122f616fe | Tomas Erland Turner | put stops and routes on int ids, saved array as txt | May 15 2020 | |||
| 89e8d79884b2 | Tomas Erland Turner | added hdfs3 to requirements.txt | May 15 2020 | |||
| d3aa1a27f51a | Tomas Erland Turner | Update Dockerfile eliminated comment #this is the new line | May 15 2020 | |||
| ab1c14cf526a | Tomas Erland Turner | trial if hdfs32 works | May 15 2020 | |||
| 49e42ca4ee12 | Tomas Erland Turner | added pyarrow to requirements and hdfs3 to dockerfile | May 15 2020 | |||
| b27bf3e14daf | Tomas Erland Turner | finished code for arrays | May 14 2020 | |||
| 4406d368b087 | Tomas Erland Turner | deleted duplicates | May 14 2020 | |||
| a7beabf342c7 | Tomas Erland Turner | Update requirements.txt, deleted hdfs and os | May 14 2020 | |||
| b9d074c58b13 | Tomas Erland Turner | added hdfs and os to requirements | May 14 2020 |