Added verb frames

In addition:
- Added prepositions.
- Rewrote a lot of the query interface. It now, for a lot of relationships, supports nested AND, OR, and NOT logic.
- Rewrote the token class. It is now a union-like class instead of being polymorphic, which means smart pointers are no longer necessary.
- Querying with regards to word derivation has been temporarily removed.
- Sentinel values are now supported for all word types.
- The VerbNet data retrieved from http://verbs.colorado.edu/~mpalmer/projects/verbnet/downloads.html was found to not be perfectly satisfactory in some regards, especially regarding adjective phrases. A patch file is now included in the repository describing the changes made to the VerbNet v3.2 download for the canonical verbly datafile.

1 files changed, 2 insertions, 6 deletions

@@ -1,10 +1,6 @@
 #ifndef UTIL_H_15DDCA2D
 #define UTIL_H_15DDCA2D
 
-#include <string>
-#include <iterator>
-#include <sstream>
-
 namespace verbly {
   
   template <class InputIterator>
@@ -32,7 +28,7 @@ namespace verbly {
     
     while (!input.empty())
     {
-      int divider = input.find(" ");
+      int divider = input.find(delimiter);
       if (divider == std::string::npos)
       {
         result.push_back(input);
@@ -41,7 +37,7 @@ namespace verbly {
       } else {
         result.push_back(input.substr(0, divider));
         
-        input = input.substr(divider+1);
+        input = input.substr(divider+delimiter.length());
       }
     }