Flattened selrestrs

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.

1 files changed, 0 insertions, 90 deletions

@@ -1,90 +0,0 @@
-#ifndef SELRESTR_H_50652FB7
-#define SELRESTR_H_50652FB7
-
-#include <list>
-#include <string>
-#include "../vendor/json/json.hpp"
-
-namespace verbly {
-
-  class selrestr {
-  public:
-    enum class type {
-      empty,
-      singleton,
-      group
-    };
-
-    // Construct from json
-
-    explicit selrestr(nlohmann::json json);
-
-    // Copy and move constructors
-
-    selrestr(const selrestr& other);
-    selrestr(selrestr&& other);
-
-    // Assignment
-
-    selrestr& operator=(selrestr other);
-
-    // Swap
-
-    friend void swap(selrestr& first, selrestr& second);
-
-    // Destructor
-
-    ~selrestr();
-
-    // Generic accessors
-
-    type getType() const
-    {
-      return type_;
-    }
-
-    // Empty
-
-    selrestr();
-
-    // Singleton
-
-    selrestr(std::string restriction, bool pos);
-
-    std::string getRestriction() const;
-
-    bool getPos() const;
-
-    // Group
-
-    selrestr(std::list<selrestr> children, bool orlogic);
-
-    std::list<selrestr> getChildren() const;
-
-    std::list<selrestr>::const_iterator begin() const;
-
-    std::list<selrestr>::const_iterator end() const;
-
-    bool getOrlogic() const;
-
-    // Helpers
-
-    nlohmann::json toJson() const;
-
-  private:
-    union {
-      struct {
-        bool pos;
-        std::string restriction;
-      } singleton_;
-      struct {
-        std::list<selrestr> children;
-        bool orlogic;
-      } group_;
-    };
-    type type_;
-  };
-
-};
-
-#endif /* end of include guard: SELRESTR_H_50652FB7 */