forked from mit-ll/em-pairing-uncor-importancesampling
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from mit-ll/master
Performance improvements
- Loading branch information
Showing
32 changed files
with
1,089 additions
and
601 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,213 @@ | ||
| # Set the default behavior, in case people don't have core.autocrlf set. | ||
| * text=auto | ||
| ## GITATTRIBUTES FOR WEB PROJECTS | ||
| # | ||
| # These settings are for any web project. | ||
| # | ||
| # Details per file setting: | ||
| # text These files should be normalized (i.e. convert CRLF to LF). | ||
| # binary These files are binary and should be left untouched. | ||
| # | ||
| # Note that binary is a macro for -text -diff. | ||
| ###################################################################### | ||
|
|
||
| # Explicitly declare text files you want to always be normalized and converted | ||
| # to native line endings on checkout. | ||
| *.c text | ||
| *.h text | ||
| # Original source | ||
| # https://github.com/alexkaratarakis/gitattributes | ||
|
|
||
| # Declare files that will always have CRLF line endings on checkout. | ||
| *.sln text eol=lf | ||
| # Auto detect | ||
| ## Handle line endings automatically for files detected as | ||
| ## text and leave all files detected as binary untouched. | ||
| ## This will handle all files NOT defined below. | ||
| * text=auto | ||
|
|
||
| # Denote all files that are truly binary and should not be modified. | ||
| *.png binary | ||
| *.jpg binary | ||
| # Source code | ||
| *.bash text eol=lf | ||
| *.bat text eol=crlf | ||
| *.cmd text eol=crlf | ||
| *.coffee text | ||
| *.css text diff=css | ||
| *.htm text diff=html | ||
| *.html text diff=html | ||
| *.inc text | ||
| *.ini text | ||
| *.js text | ||
| *.json text | ||
| *.jsx text | ||
| *.less text | ||
| *.ls text | ||
| *.map text -diff | ||
| *.od text | ||
| *.onlydata text | ||
| *.php text diff=php | ||
| *.pl text | ||
| *.ps1 text eol=crlf | ||
| *.py text diff=python | ||
| *.rb text diff=ruby | ||
| *.sass text | ||
| *.scm text | ||
| *.scss text diff=css | ||
| *.sh text eol=lf | ||
| *.sql text | ||
| *.styl text | ||
| *.tag text | ||
| *.ts text | ||
| *.tsx text | ||
| *.xml text | ||
| *.xhtml text diff=html | ||
|
|
||
| # Docker | ||
| Dockerfile text | ||
|
|
||
| # Documentation | ||
| *.ipynb text | ||
| *.markdown text diff=markdown | ||
| *.md text diff=markdown | ||
| *.mdwn text diff=markdown | ||
| *.mdown text diff=markdown | ||
| *.mkd text diff=markdown | ||
| *.mkdn text diff=markdown | ||
| *.mdtxt text | ||
| *.mdtext text | ||
| *.txt text | ||
| AUTHORS text | ||
| CHANGELOG text | ||
| CHANGES text | ||
| CONTRIBUTING text | ||
| COPYING text | ||
| copyright text | ||
| *COPYRIGHT* text | ||
| INSTALL text | ||
| license text | ||
| LICENSE text | ||
| NEWS text | ||
| readme text | ||
| *README* text | ||
| TODO text | ||
|
|
||
| # Templates | ||
| *.dot text | ||
| *.ejs text | ||
| *.haml text | ||
| *.handlebars text | ||
| *.hbs text | ||
| *.hbt text | ||
| *.jade text | ||
| *.latte text | ||
| *.mustache text | ||
| *.njk text | ||
| *.phtml text | ||
| *.tmpl text | ||
| *.tpl text | ||
| *.twig text | ||
| *.vue text | ||
|
|
||
| # Configs | ||
| *.cnf text | ||
| *.conf text | ||
| *.config text | ||
| .editorconfig text | ||
| .env text | ||
| .gitattributes text | ||
| .gitconfig text | ||
| .htaccess text | ||
| *.lock text -diff | ||
| package.json text eol=lf | ||
| package-lock.json text -diff | ||
| pnpm-lock.yaml text eol=lf -diff | ||
| yarn.lock text -diff | ||
| *.toml text | ||
| *.yaml text | ||
| *.yml text | ||
| browserslist text | ||
| Makefile text | ||
| makefile text | ||
|
|
||
| # Heroku | ||
| Procfile text | ||
|
|
||
| # Graphics | ||
| *.ai binary | ||
| *.bmp binary | ||
| *.eps binary | ||
| *.gif binary | ||
| *.gifv binary | ||
| *.ico binary | ||
| *.jng binary | ||
| *.jp2 binary | ||
| *.jpg binary | ||
| *.jpeg binary | ||
| *.jpx binary | ||
| *.jxr binary | ||
| *.pdf binary | ||
| *.png binary | ||
| *.psb binary | ||
| *.psd binary | ||
| # SVG treated as an asset (binary) by default. | ||
| *.svg text | ||
| # If you want to treat it as binary, | ||
| # use the following line instead. | ||
| # *.svg binary | ||
| *.svgz binary | ||
| *.tif binary | ||
| *.tiff binary | ||
| *.wbmp binary | ||
| *.webp binary | ||
|
|
||
| # Audio | ||
| *.kar binary | ||
| *.m4a binary | ||
| *.mid binary | ||
| *.midi binary | ||
| *.mp3 binary | ||
| *.ogg binary | ||
| *.ra binary | ||
|
|
||
| # Video | ||
| *.3gpp binary | ||
| *.3gp binary | ||
| *.as binary | ||
| *.asf binary | ||
| *.asx binary | ||
| *.fla binary | ||
| *.flv binary | ||
| *.m4v binary | ||
| *.mng binary | ||
| *.mov binary | ||
| *.mp4 binary | ||
| *.mpeg binary | ||
| *.mpg binary | ||
| *.ogv binary | ||
| *.swc binary | ||
| *.swf binary | ||
| *.webm binary | ||
|
|
||
| # Archives | ||
| *.7z binary | ||
| *.gz binary | ||
| *.jar binary | ||
| *.rar binary | ||
| *.tar binary | ||
| *.zip binary | ||
|
|
||
| # Fonts | ||
| *.ttf binary | ||
| *.eot binary | ||
| *.otf binary | ||
| *.woff binary | ||
| *.woff2 binary | ||
|
|
||
| # Executables | ||
| *.exe binary | ||
| *.pyc binary | ||
|
|
||
| # RC files (like .babelrc or .eslintrc) | ||
| *.*rc text | ||
|
|
||
| # Ignore files (like .npmignore or .gitignore) | ||
| *.*ignore text | ||
|
|
||
| # MATLAB | ||
| *.mat binary | ||
|
|
||
| # Declare files that will always have LF line endings on checkout. | ||
| *.ini text eol=lf | ||
| *.txt text eol=lf | ||
| *.csv text eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| # Changelog | ||
|
|
||
| All notable changes to this project will be documented in this file. | ||
|
|
||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||
| and this project should adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||
|
|
||
| ## [Unreleased] | ||
|
|
||
| ## [1.2.0] - 2021-07-19 | ||
|
|
||
| ### Added | ||
|
|
||
| - `.gitattributes` added for repository management | ||
| - `preallocateEncProperties` to preallocate struct of encounter metadata | ||
| - Basic performance benchmark metrics to generateDAAEncounterSet() and plotted in RUN_DAAEncounterModelTool_serial | ||
| - Default input and output directories | ||
|
|
||
| ### Changed | ||
|
|
||
| - Substantial performance boost through preallocating, minimizing use of dynamically growth of arrays, and removing large variables that are not used. On a local windows machine, these improvements reduce the time to generate 100K encounters from days to hours | ||
| - Updated mex instructions to use the -g flag | ||
| - Trajectory .csv files explicitly use UTF-8 encoding | ||
| - Updated line endings for various files to better cross platform compability | ||
| - Renamed matlab startup script | ||
| - MATLAB startip script checks for symbolic math toolbox | ||
| - MATLAB startup script to add self path using system environment variable instead of `pwd()` | ||
| - Removed various unnecessary unit conversions by [@cserres](https://github.com/cserres) | ||
|
|
||
| ### Fixed | ||
|
|
||
| - Random seed sequentially updated and guaranteed to be unique up to a seed of 2^32 (the MATLAB limit) | ||
| - Fix bug when checking duplicate settings when looking if there has been any encounter model customization | ||
| - `generateDAAEncounterSet` formats input to `wpt2script` correctly | ||
|
|
||
| ### Removed | ||
|
|
||
| - Remove `em_read` that was shadowed by the version in [em-model-manned-bayes](https://github.com/airspace-Encounter-Models/em-model-manned-bayes) | ||
| - `checkINIInputs()` no longer issues warnings about the uncor_1200code_v2p1 model | ||
| - Removed instances %#okgrow that suppressed warnings | ||
|
|
||
| ## [1.1.0] - 2020-10-02 | ||
|
|
||
| ### Changed | ||
|
|
||
| - Updated to output original encounter model events | ||
|
|
||
| ## [1.0.0] - 2020-09-10 | ||
|
|
||
| ### Added | ||
|
|
||
| - Initial public release | ||
|
|
||
| [1.2.0]: https://github.com/Airspace-Encounter-Models/em-pairing-uncor-importancesampling/releases/tag/v1.2 | ||
| [1.1.0]: https://github.com/Airspace-Encounter-Models/em-pairing-uncor-importancesampling/releases/tag/v1.1 | ||
| [1.0.0]: https://github.com/Airspace-Encounter-Models/em-pairing-uncor-importancesampling/releases/tag/v1.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.