From ef4273ba47a2da9cea0aed59235e2d0a86bb8d7e Mon Sep 17 00:00:00 2001
From: John Fultz <jfultz@wolfram.com>
Date: Tue, 13 Oct 2015 12:00:13 -0500
Subject: Saving custom dictionaries now really works.

* Fix a number of remaining bugs in the lexicon dialog.
* Fix an error reading the v1 DAWG.
* Improve the word counting mechanism.
* Make sure the lexicn dialog properly selects and loads
its dictionary after it's done.
* Implement deleting of user dictionaries.
* Clean up dictionary info text in lexicon dialog.
* Disable gaddag generation...still have to fix that up
to happen at sensible times and with user notification.
---
 quackleio/dawgfactory.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'quackleio/dawgfactory.h')

diff --git a/quackleio/dawgfactory.h b/quackleio/dawgfactory.h
index 5872dc3..efcc455 100644
--- a/quackleio/dawgfactory.h
+++ b/quackleio/dawgfactory.h
@@ -30,19 +30,18 @@ public:
 	DawgFactory(const QString &alphabetFile);
 	~DawgFactory();
 
-	void computeWordCount() const;
-	int wordCount() const { return m_wordCount; };
+	int wordCount() const { return m_encodableWords; };
 	string letterCountString() const;
 	int nodeCount() const { return m_nodelist.size(); };
 	int encodableWords() const { return m_encodableWords; };
 	int unencodableWords() const { return m_unencodableWords; };
 	int duplicateWords() const { return m_duplicateWords; };
 
-	bool pushWord(const UVString& word, bool inSmaller, int playability);
-	bool pushWord(const Quackle::LetterString& word, bool inSmaller, int playability);
+	bool pushWord(const UVString &word, bool inSmaller, int playability);
+	bool pushWord(const Quackle::LetterString &word, bool inSmaller, int playability);
 	void hashWord(const Quackle::LetterString &word);
 	void generate();
-	void writeIndex(const UVString& filename);
+	void writeIndex(const string &filename);
 
 	const char* hashBytes() { return m_hash.charptr; };
 
@@ -50,10 +49,9 @@ private:
 	class Node {
 	public:
 		bool pushWord(const Quackle::LetterString& word, bool inSmaller, int pb);
-		void print(vector< Node* >& m_nodelist);
+		void print(vector< Node* > &m_nodelist);
 
 		int letterSum() const;
-		int wordCount(unsigned int depth, vector<unsigned int> &countsByLength) const;
 		bool equals(const Node &n) const;
 
 		Quackle::Letter c;
@@ -67,7 +65,7 @@ private:
 		bool lastchild;
 
 		mutable bool sumexplored;
-		mutable int sum;
+		mutable unsigned int sum;
 		mutable vector<int> counts;
 			
 		bool deleted;
@@ -79,8 +77,7 @@ private:
 	int m_unencodableWords;
 	int m_duplicateWords;
 	vector< Node* > m_nodelist;
-	mutable int m_wordCount;
-	mutable vector<unsigned int> m_countsByLength;
+	vector<unsigned int> m_countsByLength;
 	Quackle::AlphabetParameters *m_alphas;
 	Node m_root;
 	union {
-- 
cgit v1.2.3