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

Correct lexicographic ordering of items from the local vocab #1390

Merged
merged 64 commits into from
Jul 27, 2024
Merged

Correct lexicographic ordering of items from the local vocab #1390

merged 64 commits into from
Jul 27, 2024

Commits on Jul 5, 2024

  1. A rough draft. Working: Joins with local vocab.

    @joka921
    joka921 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    78ec2b2 View commit details
    Browse the repository at this point in the history

  2. The sorting now works between 

    local Vocab and Vocab.
However the sorting between local vocab entries doesn't yet work.
    @joka921
    joka921 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    79d90b9 View commit details
    Browse the repository at this point in the history

  3. A lot of cases work now.

    @joka921
    joka921 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    9c73759 View commit details
    Browse the repository at this point in the history

  4. Everything compiles. 

    TODO:
* Binary search expressions (at least partially).

* Fix unit tests
* Clean everything up.
    @joka921
    joka921 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    05089b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. It seems to work, now fix and add tests.

    @joka921
    joka921 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    aab72ec View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Fixing more tests... 

    Only small things not yet working.
    @joka921
    joka921 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e763d98 View commit details
    Browse the repository at this point in the history

  2. All tests working. 

    This is still missing comments,
and we neeed to discuss and understand the
ICU Levels etc.
    @joka921
    joka921 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1f38f43 View commit details
    Browse the repository at this point in the history

  3. NexistePasMore stuff.

    @joka921
    joka921 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    13fd1ae View commit details
    Browse the repository at this point in the history

  4. Tests not working at all, but the local vocab is messy....

    @joka921
    joka921 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    eae3725 View commit details
    Browse the repository at this point in the history

  5. Another bug...

    @joka921
    joka921 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4329a4c View commit details
    Browse the repository at this point in the history

  6. A lot of stuff not working with the external vocabulary... 

    We really have to fix this...
    @joka921
    joka921 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    aa2bfad View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. In the middle of a review....

    @joka921
    joka921 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    62a0800 View commit details
    Browse the repository at this point in the history

  2. Fix a small bug in the pattern creation. 

    TODO<joka921>
Add a unit test that would have caught this bug.
    @joka921
    joka921 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    634400a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Fix the unit test.

    @joka921
    joka921 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    33c64b6 View commit details
    Browse the repository at this point in the history

  2. Some fixes.

    @joka921
    joka921 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    59b64b0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/small-bug-pattern-creation' into correct-com… 

    …parison-local-vocab

# Conflicts:
#	src/index/PatternCreator.cpp
    @joka921
    joka921 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    6796af1 View commit details
    Browse the repository at this point in the history

  4. Fix the unit tests, so that we can work alongside our beloved tools f… 

    …rom now on.
    @joka921
    joka921 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    0d34669 View commit details
    Browse the repository at this point in the history

  5. Fix the unit test.

    @joka921
    joka921 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    3072377 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Fixed unused variables. 

    Next try: store an IndexPointer in the
LocalVocabEntries.
    @joka921
    joka921 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    baa30f1 View commit details
    Browse the repository at this point in the history

  2. Add some comments.

    @joka921
    joka921 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    ef940e8 View commit details
    Browse the repository at this point in the history

  3. Try to fix the E2E tests by using different settings...

    @joka921
    joka921 committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    fa50324 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. A first draft of a correctly interleaved vocab.

    @joka921
    joka921 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    e550067 View commit details
    Browse the repository at this point in the history

  2. Start integrating into the vocabulary. 

    TODO: Index building and all the other TODOs.
    @joka921
    joka921 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    7145b80 View commit details
    Browse the repository at this point in the history

  3. TODO: 

    Continue after lunch.
    @joka921
    joka921 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    849b3d4 View commit details
    Browse the repository at this point in the history

  4. TODO<joka921> pass On ethe information about compression to the inter… 

    …nal or external vocabulary.
    @joka921
    joka921 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    9d5d2fa View commit details
    Browse the repository at this point in the history

  5. This compiles...

    @joka921
    joka921 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    0d59e1d View commit details
    Browse the repository at this point in the history

  6. We are finding bugs through unit tests.

    @joka921
    joka921 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    bfb6be9 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. More unit tests passing, everything compiles.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0a93ebb View commit details
    Browse the repository at this point in the history

  2. Implement caching.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    1ab304d View commit details
    Browse the repository at this point in the history

  3. Fix bug.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    1caf71c View commit details
    Browse the repository at this point in the history

  4. Smaller default milestone distance.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    97d2052 View commit details
    Browse the repository at this point in the history

  5. Make gcc happy

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4cb95b7 View commit details
    Browse the repository at this point in the history

  6. Unnecessary complexity in the comparison.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    ac67c7a View commit details
    Browse the repository at this point in the history

  7. We are getting there, need to prove some things.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    a92c93c View commit details
    Browse the repository at this point in the history

  8. It seems to work, we improve one after the other.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7541116 View commit details
    Browse the repository at this point in the history

  9. Let the unit tests pass again....

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    b97e782 View commit details
    Browse the repository at this point in the history

  10. This is really getting into shape.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    72a3cdf View commit details
    Browse the repository at this point in the history

  11. Refactoring etc.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    002354e View commit details
    Browse the repository at this point in the history

  12. Move to anonymous namespace for testing.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    e741338 View commit details
    Browse the repository at this point in the history

  13. Move to anonymous namespace for testing.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    b8a1daf View commit details
    Browse the repository at this point in the history

  14. Merge branch 'refs/heads/master' into correct-vocabulary

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4054973 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'refs/heads/master' into correct-comparison-local-vocab 

    # Conflicts:
#	src/index/PatternCreator.cpp
#	test/index/PatternCreatorTest.cpp
    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c241eca View commit details
    Browse the repository at this point in the history

  16. A round of reviews with Hannah.

    @joka921
    joka921 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7ffe7df View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Completely refactor the wordAndIndex class.

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    ce94613 View commit details
    Browse the repository at this point in the history

  2. This works.

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    79eb1f5 View commit details
    Browse the repository at this point in the history

  3. More cleanups.

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    fc9b073 View commit details
    Browse the repository at this point in the history

  4. Might this word? 

    Feed it to the tools.
    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    949f1f6 View commit details
    Browse the repository at this point in the history

  5. Further cleanup for sonarcloud

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    9b9b85c View commit details
    Browse the repository at this point in the history

  6. Bugfix

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    dd97717 View commit details
    Browse the repository at this point in the history

  7. Further cleanups.

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    b2227f5 View commit details
    Browse the repository at this point in the history

  8. Further further cleanups.

    @joka921
    joka921 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    d16bbac View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. A review.

    @joka921
    joka921 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    89f496b View commit details
    Browse the repository at this point in the history

  2. Tiny last round of reviews.

    @joka921
    joka921 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    9582b19 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Merge branch 'refs/heads/master' into correct-comparison-local-vocab

    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    edfeb81 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/correct-vocabulary' into correct-comparison-… 

    …local-vocab

# Conflicts:
#	src/index/IndexImpl.cpp
#	test/IndexTest.cpp
    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    694cffd View commit details
    Browse the repository at this point in the history

  3. Fix all the unit tests....

    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    118f50b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/master' into correct-comparison-local-vocab 

    # Conflicts:
#	src/index/IndexImpl.cpp
    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    af036c4 View commit details
    Browse the repository at this point in the history

  5. Fix some sonarcloud issues.

    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d933852 View commit details
    Browse the repository at this point in the history

  6. Changes from a review.

    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    0636b6e View commit details
    Browse the repository at this point in the history

  7. Tiny final reviews...

    @joka921
    joka921 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    1ed9ab2 View commit details
    Browse the repository at this point in the history

  8. Add member for explicit slicing (to make SonarCloud happy)

    Hannah Bast committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    e3dbc9f View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Remove std::move in CopyableAtomic move constructor 

    Trying out whether not only gcc 13, but also everyone else (including
SonarCloud) will be happy with this.
    Hannah Bast committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    745c521 View commit details
    Browse the repository at this point in the history

  2. Also removing the std::move in the move assignment

    Hannah Bast committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    f4b2a12 View commit details
    Browse the repository at this point in the history

  3. Also make the noecxept unconditional

    Hannah Bast committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    7dd4906 View commit details
    Browse the repository at this point in the history