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

Jump to bottom

Merge master into develop #1483

Merged
merged 12 commits into from
Jul 14, 2019
Merged

Merge master into develop #1483

merged 12 commits into from
Jul 14, 2019

Commits on Jul 8, 2019

  1. Updated git ignore 

    Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    4e9efe4 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2019

  1. moved eclipse code conventions to correct location

    @abrokenjester
    abrokenjester committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    a4d382f View commit details
    Browse the repository at this point in the history

  2. fixes in formatting

    @abrokenjester
    abrokenjester committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    766abfc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2019

  1. #1441 benchmarks 

    Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    af66490 View commit details
    Browse the repository at this point in the history

  2. #1441 non recursive implementation 

    Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    771332a View commit details
    Browse the repository at this point in the history

  3. #1441 switched to LinkedHashModel and also fixed size for LinkedHashM… 

    …odel

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    1c75da3 View commit details
    Browse the repository at this point in the history

  4. fixed benchmarks 

    Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    a3b58c1 View commit details
    Browse the repository at this point in the history

  5. #1441 optimised contains(Object o) in LinkedHashModel to use statemen… 

    …ts SET if possible

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    c11e457 View commit details
    Browse the repository at this point in the history

  6. #1441 optimized by using HashSet where available 

    Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    cf4676b View commit details
    Browse the repository at this point in the history

  7. changes based on comments as well as some reverts for performance imp… 

    …rovements that didn't really help and various fixes

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    673e7a0 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1476 from eclipse/issues/1441_models_isomorphic 

    Issues/1441 models isomorphic benchmarks
    @hmottestad
    hmottestad authored Jul 14, 2019
    Configuration menu
    Copy the full SHA
    1abe4fe View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into mergeMasterBranch 

    Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
    @hmottestad
    hmottestad committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    2ee47d6 View commit details
    Browse the repository at this point in the history