Started structural rewrite

The new object structure was designed to build on the existing WordNet
structure, while also adding in all of the data that we get from other sources.
More information about this can be found on the project wiki.

The generator has already been completely rewritten to generate a
datafile that uses the new structure. In addition, a number of indexes
are created, which does double the size of the datafile, but also allows
for much faster lookups. Finally, the new generator is written modularly
and is a lot more readable than the old one.

The verbly interface to the new object structure has mostly been
completed, but has not been tested fully. There is a completely new
search API which utilizes a lot of operator overloading; documentation
on how to use it should go up at some point.

Token processing and verb frames are currently unimplemented. Source for
these have been left in the repository for now.

1 files changed, 91 insertions, 0 deletions

@@ -0,0 +1,91 @@
+#ifndef NOTION_H_221DE2BC
+#define NOTION_H_221DE2BC
+
+#include <cassert>
+#include <list>
+#include <string>
+#include "enums.h"
+
+namespace verbly {
+  namespace generator {
+
+    class database;
+
+    class notion {
+    public:
+
+      // Constructors
+
+      explicit notion(part_of_speech partOfSpeech);
+
+      notion(part_of_speech partOfSpeech, int wnid);
+
+      // Mutators
+
+      void incrementNumOfImages();
+      
+      void setPrepositionGroups(std::list<std::string> groups);
+
+      // Accessors
+
+      int getId() const
+      {
+        return id_;
+      }
+
+      part_of_speech getPartOfSpeech() const
+      {
+        return partOfSpeech_;
+      }
+      
+      bool hasWnid() const
+      {
+        return hasWnid_;
+      }
+
+      int getWnid() const
+      {
+        // Calling code should always call hasWnid first.
+        assert(hasWnid_);
+
+        return wnid_;
+      }
+
+      int getNumOfImages() const
+      {
+        // Calling code should always call hasWnid and check that the notion is a noun first.
+        assert(hasWnid_ && (partOfSpeech_ == part_of_speech::noun));
+
+        return numOfImages_;
+      }
+      
+      std::list<std::string> getPrepositionGroups() const
+      {
+        // Calling code should always check that the notion is a preposition first.
+        assert(partOfSpeech_ == part_of_speech::preposition);
+        
+        return prepositionGroups_;
+      }
+
+    private:
+
+      static int nextId_;
+
+      const int id_;
+      const part_of_speech partOfSpeech_;
+      const int wnid_ = 0;
+      const bool hasWnid_ = false;
+
+      int numOfImages_ = 0;
+      std::list<std::string> prepositionGroups_;
+
+    };
+
+    // Serializer
+
+    database& operator<<(database& db, const notion& arg);
+
+  };
+};
+
+#endif /* end of include guard: NOTION_H_221DE2BC */