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.

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

Merge master and reconcile differences #756

Open
wants to merge 106 commits into
base: balaur
Choose a base branch
from
Open

Commits on Feb 15, 2023

  1. Remove Tuple class use

    kwalcock committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    6b912a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. Configuration menu
    Copy the full SHA
    cdf5055 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #712 from clulab/kwalcock/webappTest

    Make sure webapp testing works, especially in IntelliJ
    kwalcock authored Feb 16, 2023
    Configuration menu
    Copy the full SHA
    f609a9a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    143e826 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #713 from clulab/kwalcock/tuples

    Remove Tuple class use
    kwalcock authored Feb 16, 2023
    Configuration menu
    Copy the full SHA
    f508413 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5e9d079 View commit details
    Browse the repository at this point in the history
  6. Make them happier

    kwalcock committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    7955951 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Fix variable name

    kwalcock committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    77ba907 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #714 from clulab/kwalcock/wordEmbeddings

    Add mostSimilarWords, documentation, and example
    kwalcock authored Feb 17, 2023
    Configuration menu
    Copy the full SHA
    efabf41 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3412251 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. Address failing test

    kwalcock committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    436444d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f4d76c1 View commit details
    Browse the repository at this point in the history
  3. Incorporate Using throughout

    kwalcock committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    c1b9303 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Configuration menu
    Copy the full SHA
    dfc4dc7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dec770f View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Copy vs. assimilate

    kwalcock committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    1badca9 View commit details
    Browse the repository at this point in the history
  2. Add Veil

    kwalcock committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    a22116b View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. Try out annotation

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    f77a2ff View commit details
    Browse the repository at this point in the history
  2. Make unknowns blank again

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    16e4cc5 View commit details
    Browse the repository at this point in the history
  3. Make webap display nicer

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    aa7e89b View commit details
    Browse the repository at this point in the history
  4. Clean up veil code

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    02a2846 View commit details
    Browse the repository at this point in the history
  5. Add comments

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    38c6a48 View commit details
    Browse the repository at this point in the history
  6. Add style to webapp

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    6a52621 View commit details
    Browse the repository at this point in the history
  7. Rename variable

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    c59a027 View commit details
    Browse the repository at this point in the history
  8. Remove test code from webapp

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    ecaf7d5 View commit details
    Browse the repository at this point in the history
  9. Remove more test code

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    6eeca89 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5c83dbd View commit details
    Browse the repository at this point in the history
  11. Add CustomRuleReader

    Override some of the now protected methods
    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    1f48397 View commit details
    Browse the repository at this point in the history
  12. Replace one protected

    kwalcock committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    1d51057 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Fix cross-compilation

    kwalcock committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    1d22a77 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Merge pull request #715 from clulab/kwalcock/using

    Change from AutoCloser to Using
    kwalcock authored Feb 28, 2023
    Configuration menu
    Copy the full SHA
    0160148 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #717 from clulab/kwalcock/dynamicRules

    Add CustomRuleReader
    kwalcock authored Feb 28, 2023
    Configuration menu
    Copy the full SHA
    f14ada8 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Document serialization

    kwalcock committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    48dc397 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Sort the roots

    kwalcock committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    b92bce6 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Test hash code

    kwalcock committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    d36c1ab View commit details
    Browse the repository at this point in the history
  2. Modify hash code

    kwalcock committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    eaa270d View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Fix test directory for SBT

    kwalcock committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    5b8e19b View commit details
    Browse the repository at this point in the history
  2. Simplify HashTest

    kwalcock committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    b6d62f0 View commit details
    Browse the repository at this point in the history
  3. Test simple string hashCode

    kwalcock committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    5a9395f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5d65563 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Configuration menu
    Copy the full SHA
    e70f964 View commit details
    Browse the repository at this point in the history
  2. First version

    kwalcock committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    f5f92f2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    030dc9c View commit details
    Browse the repository at this point in the history
  4. Add more tests

    kwalcock committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    3213991 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    945285d View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Fix a test

    kwalcock committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    b6e8712 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Merge pull request #726 from clulab/masha-pounds

    added plurals for pounds and lbs
    kwalcock authored Mar 24, 2023
    Configuration menu
    Copy the full SHA
    9a1fee2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #719 from clulab/kwalcock/documentSerialization

    Fix issues with serialization of documents
    kwalcock authored Mar 24, 2023
    Configuration menu
    Copy the full SHA
    c118028 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Bump nokogiri from 1.13.10 to 1.14.3 in /docs

    Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.10 to 1.14.3.
    - [Release notes](https://github.com/sparklemotion/nokogiri/releases)
    - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
    - [Commits](sparklemotion/nokogiri@v1.13.10...v1.14.3)
    
    ---
    updated-dependencies:
    - dependency-name: nokogiri
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ee29a97 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Configuration menu
    Copy the full SHA
    26e6b47 View commit details
    Browse the repository at this point in the history
  2. Remove Using._

    kwalcock committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    03fb091 View commit details
    Browse the repository at this point in the history
  3. Update Scala versions

    kwalcock committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    002b52d View commit details
    Browse the repository at this point in the history
  4. Comment on version number

    kwalcock committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    4f01195 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Configuration menu
    Copy the full SHA
    a661d5d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb8b091 View commit details
    Browse the repository at this point in the history
  3. Make webap display nicer

    kwalcock committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    88ec35e View commit details
    Browse the repository at this point in the history
  4. Add style to webapp

    kwalcock committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    1c4b627 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #733 from clulab/kwalcock/webapp

    Make cosmetic improvements to webapp
    kwalcock authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    dda0a8f View commit details
    Browse the repository at this point in the history
  6. Show document type

    kwalcock committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    3f2ca9a View commit details
    Browse the repository at this point in the history
  7. Merge pull request #716 from clulab/kwalcock/veil

    Show how letters and words can be veiled
    kwalcock authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    77159ff View commit details
    Browse the repository at this point in the history
  8. Merge pull request #732 from clulab/kwalcock/closeSource

    Update collection compatibility library
    kwalcock authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    5324c05 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #723 from clulab/kwalcock/rehash

    Move all hash code to HashCode class
    kwalcock authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    c52dd58 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Configuration menu
    Copy the full SHA
    86173d5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #734 from clulab/kwalcock/dependabot

    Merge dependabot PR into current main branch
    kwalcock authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    8fd3879 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #727 from clulab/kwalcock/distToRoot

    Refactor DependencyUtils so that distToRoot can be reused
    kwalcock authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    feb8557 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. 1) added normalizer for imprecise dates (e.g., 'first week of April')…

    …, 2) added fall to SEASON.tsv
    alicekwak committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    71d6edf View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. fall/spring filter added

    alicekwak committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    627eda9 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Configuration menu
    Copy the full SHA
    18cf67e View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. 1) revised and moved new tests into TestNumericEntityRecognition 2) R…

    …evised grammars and actions
    alicekwak committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    b8f2694 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Fix test in dependency utils

    kwalcock committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    eb5539f View commit details
    Browse the repository at this point in the history
  2. Fix mention test

    kwalcock committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    6695055 View commit details
    Browse the repository at this point in the history
  3. Smooth out NumericActions

    kwalcock committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    2582a4a View commit details
    Browse the repository at this point in the history
  4. Change variable name

    kwalcock committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    beb9e14 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Configuration menu
    Copy the full SHA
    a6f3fd0 View commit details
    Browse the repository at this point in the history
  2. Fix test in dependency utils

    kwalcock committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    be19dde View commit details
    Browse the repository at this point in the history
  3. Fix mention test

    kwalcock committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    cfd82b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Merge pull request #740 from clulab/kwalcock/ft

    Correct unit tests
    kwalcock authored Aug 23, 2023
    Configuration menu
    Copy the full SHA
    2a87153 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0149e78 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #739 from clulab/ft

    added ft. as measurement unit
    kwalcock authored Aug 23, 2023
    Configuration menu
    Copy the full SHA
    7073b6f View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. cleaned up unwanted lines

    alicekwak committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    9152996 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cc932cb View commit details
    Browse the repository at this point in the history
  3. Forcing an empty commit.

    alicekwak committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    f723a33 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    007d233 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge pull request #736 from clulab/alice-date-revision

    Added "fall" as a season & normalized "week of month" patterns
    kwalcock authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    d2e5e4a View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Configuration menu
    Copy the full SHA
    7172f71 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. started debugging

    MihaiSurdeanu committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    d28eed3 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. added WeakPossibleYear

    MihaiSurdeanu committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    7abaed9 View commit details
    Browse the repository at this point in the history
  2. "fall" filter bug fix

    MihaiSurdeanu committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    548e632 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Clean up after my own complaints

    Regular expression and variable names in numeric routines
    Keith Alcock committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    8bf0cb8 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2023

  1. Merge pull request #753 from clulab/kwalcock/fall

    Clean up after my own complaints
    kwalcock authored Sep 17, 2023
    Configuration menu
    Copy the full SHA
    667b4d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Merge pull request #752 from clulab/fall

    Fixed the "Fall" filter bug
    kwalcock authored Sep 19, 2023
    Configuration menu
    Copy the full SHA
    1ca4472 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b57541b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Fix immediate merge problems

    kwalcock committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    c2588ca View commit details
    Browse the repository at this point in the history
  2. Get old CluProcessor

    kwalcock committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    3fcf8b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1909e3f View commit details
    Browse the repository at this point in the history
  4. Use type instead of tuple

    kwalcock committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    5fa534a View commit details
    Browse the repository at this point in the history
  5. Fix Scala 2.11 syntax

    kwalcock committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    a19104e View commit details
    Browse the repository at this point in the history
  6. added hybrid deps

    MihaiSurdeanu authored and kwalcock committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    abd5c8a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    89ba0bb View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Increase a timeout

    kwalcock committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a4898d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    da2bfd1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d8fac3d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ff07326 View commit details
    Browse the repository at this point in the history
  5. Streamline setLabelsAndNorms

    kwalcock committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    291a080 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    145613a View commit details
    Browse the repository at this point in the history
  7. Skip time check

    kwalcock committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8cf219d View commit details
    Browse the repository at this point in the history