summary refs log tree commit diff stats
path: root/vendor/json/json.hpp
Commit message (Collapse)AuthorAgeFilesLines
* Flattened selrestrsKelly Rauchenberger2017-02-051-12201/+0
| | | | | | | | | | | | | | | Now, selrestrs are, instead of logically being a tree of positive/negative restrictions that are ANDed/ORed together, they are a flat set of positive restrictions that are ORed together. They are stored as strings in a table called selrestrs, just like synrestrs, which makes them a lot more queryable now as well. This change required some changes to the VerbNet data, because we needed to consolidate any ANDed clauses into single selrestrs, as well as convert any negative selrestrs into positive ones. The changes made are detailed on the wiki. Preposition choices are now encoded as comma-separated lists instead of using JSON. This change, along with the selrestrs one, allows us to remove verbly's dependency on nlohmann::json.
* Updated to nlohmann/json 2.0.9Kelly Rauchenberger2016-12-281-291/+1698
|
* Removed nlohmann/json submoduleKelly Rauchenberger2016-11-271-0/+10794
The submodule contained around 73MB of benchmarks and tests that are not necessary for inclusion in this project. Thus, the submodule has been removed, and the 2.0.7 release of nlohmann/json has been added to the repository.