settings finished(1st version)

Author: ZXCroon

basic.cpp

@@ -20,6 +20,7 @@ void Basic::transStrToProp(const string& infoStr) {
     rp = infoStr.find(".", lp) - 1;
     timestamp = str::strToInt(infoStr.substr(lp, rp - lp + 1));
   }
+  
   lp = infoStr.find("@level@");
   if (lp == string::npos) {
     level = 0;
@@ -30,23 +31,33 @@ void Basic::transStrToProp(const string& infoStr) {
     level = str::strToInt(infoStr.substr(lp, rp - lp + 1));
   }
 
-  /*
-  lp = infoStr.find("@strategy@");
+  lp = infoStr.find("@selectstrategy@");
   if (lp == string::npos) {
-    ///////////
+    sstraNum = -1;
   }
   else {
-    lp += 10;
+    lp += 16;
     rp = infoStr.find(".", lp) - 1;
-    ///////////
+    sstraNum = str::strToInt(infoStr.substr(lp, rp - lp + 1));
   }
-  */
+
+  lp = infoStr.find("@formstrategy@");
+  if (lp == string::npos) {
+    sstraNum = 0;
+  }
+  else {
+    lp += 14;
+    rp = infoStr.find(".", lp) - 1;
+    fstraNum = str::strToInt(infoStr.substr(lp, rp - lp + 1));
+  }
+  
 }
 
 string Basic::transPropToStr() {
   string res = "@timestamp@" + str::intToStr(timestamp) + ".\n";
-  res += "@level@" + str::intToStr(level) + ".";
-  ////////
+  res += "@level@" + str::intToStr(level) + ".\n";
+  res += "@selectstrategy@" + str::intToStr(sstraNum) + ".\n";
+  res += "@formstrategy@" + str::intToStr(fstraNum) + ".\n";
   return res;
 }
 
@@ -59,7 +70,13 @@ int Basic::getLevel() {
   return level;
 }
 
-////////// getStrategy()
+int Basic::getSelectStrategy() {
+  return sstraNum;
+}
+
+int Basic::getFormStrategy() {
+  return fstraNum;
+}
 
 void Basic::setTimestamp(int ts) {
   timestamp = ts;
@@ -69,4 +86,10 @@ void Basic::setLevel(int le) {
   level = le;
 }
 
-////////// setStrategy()
+void Basic::setSelectStrategy(int ss) {
+  sstraNum = ss;
+}
+
+void Basic::setFormStrategy(int fs) {
+  fstraNum = fs;
+}

basic.h

@@ -11,15 +11,20 @@ class Basic : public ComplexInfo {
 
   int getTimestamp();
   int getLevel();
+  int getSelectStrategy();
+  int getFormStrategy();
   void setTimestamp(int ts);
   void setLevel(int le);
+  void setSelectStrategy(int ss);
+  void setFormStrategy(int fs);
+  
 
 protected:
   void transStrToProp(const string& infoStr);
   string transPropToStr();
 
 private:
-  int timestamp, level;
+  int timestamp, level, sstraNum, fstraNum;
 
 };
 

env.cpp

@@ -65,6 +65,10 @@ string Env::getUserName() {
   return userName;
 }
 
+void Env::setUserName(const string& newUserName) {
+  userName = newUserName;
+}
+
 void Env::pass(const string& word, int diffi, bool ok) {
   statList[diffi]->setTotal(statList[diffi]->getTotal() + 1);
   Progress prog(fsbProg, word);

env.h

@@ -20,6 +20,7 @@ class Env {
 
   void pass(const string& word, int diffi, bool ok);
   string getUserName();
+  void setUserName(const string& newUserName);
 
   FileStrBridge* fsbDef;
   FileStrBridge* fsbSent;

factory.cpp

@@ -0,0 +1,37 @@
+#include "factory.h"
+
+Factory::Factory(Env* env) : env(env) {
+}
+
+SelectStrategyFactory::SelectStrategyFactory(Env* env) :
+    Factory(env) {
+}
+
+SelectStrategy* SelectStrategyFactory::produce(int diffi) {
+  if (diffi == -1) {
+    return new RandomSelection(env);
+  }
+  if (diffi == DIFFI_NUM) {
+    return new SmartSelection(env);
+  }
+  if (diffi >= 0 && diffi < DIFFI_NUM) {
+    return new FixedSelection(env, diffi);
+  }
+  return NULL;
+}
+
+
+
+FormStrategyFactory::FormStrategyFactory(Env* env) : Factory(env) {
+}
+
+FormStrategy* FormStrategyFactory::produce(int n) {
+  switch (n) {
+
+  case 0:
+    return new RemOrNotForm;
+  default:
+    return NULL;
+    
+  }
+}

factory.h

@@ -0,0 +1,37 @@
+#ifndef FACTORY_H
+#define FACTORY_H
+
+#include "env.h"
+#include "strategy.h"
+
+class Factory {
+
+public:
+  Factory(Env* env);
+
+protected:
+  Env* env;
+  
+};
+
+class SelectStrategyFactory : public Factory {
+
+public:
+  SelectStrategyFactory(Env* env);
+  SelectStrategy* produce(int diffi);
+
+private:
+  int diffi;
+  
+};
+
+class FormStrategyFactory : public Factory {
+
+public:
+  FormStrategyFactory(Env* env);
+  FormStrategy* produce(int n);
+  
+};
+
+
+#endif

file_system.cpp

@@ -0,0 +1,131 @@
+//Some file system API adapter
+
+#include "file_system.h"
+
+
+//============For Windows=============
+
+#ifdef _WIN32
+
+  #include <sys/stat.h>
+  #include <direct.h>
+  
+
+  bool dirExists(char* dirName)
+  {
+    struct _stat fileStat;
+    if ((_stat(dirName, &fileStat) == 0) && (fileStat.st_mode & _S_IFDIR))
+    {
+      return true;
+    }
+    else
+    {
+      return false;
+    }  
+  }
+
+  bool makeDir(char* dirName)
+  {
+    if (dirExists(dirName))
+    {
+      return true;
+    }
+    mkdir(dirName);
+    return dirExists(dirName);
+  }
+
+#endif
+
+
+//===============For Linux=================
+
+#ifdef _linux_
+
+  #include <sys/stat.h>
+  #include <sys/types.h>
+  #include <unistd.h>
+
+
+  bool dirExists(char* dirName)
+  {
+    struct stat fileStat;
+    if ((stat(dirName, &fileStat) == 0) && S_ISDIR(fileStat.st_mode))
+    {
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+  
+  bool makeDir(char* dirName)
+  {
+    if (dirExists(dirName))
+    {
+      return true;
+    }
+    mkdir(dirName, S_IRWXG); 
+    return dirExists(dirName);
+  }
+
+
+#endif
+
+
+//=================For Mac OS===================
+
+#ifdef _APPLE_
+
+  bool dirExists(char* dirName)
+  {
+
+  }
+
+  bool makeDir(char* dirName)
+  {
+
+  }
+
+#endif
+
+
+//===============General===================
+
+bool dirExists(std::string dirName)
+{
+  char *dir = (char*)dirName.data();
+  return dirExists(dir);
+}
+
+bool makeDir(std::string dirName)
+{
+  char *dir = (char*)dirName.data();
+  return makeDir(dir);
+}
+
+bool smartMakeDir(char* dirName)
+{
+  char *tag;
+  for(tag = dirName; *tag; tag++)
+  {
+    if (*tag == '\\')
+    {
+      char buf[1000], path[1000];
+      strcpy(buf, dirName);
+      buf[strlen(dirName) - strlen(tag) + 1] = NULL;
+      strcpy(path, buf);
+      if (! dirExists(path))
+      {
+        makeDir(path);
+      }
+    }
+  }
+  return dirExists(dirName);
+}
+
+bool smartMakeDir(std::string dirName)
+{
+  char *dir = (char*)dirName.data();
+  return smartMakeDir(dir);
+}

file_system.h

@@ -0,0 +1,20 @@
+//Some file system API adapter
+
+#ifndef FILE_SYSTEM_H
+#define FILE_SYSTEM_H
+
+#include <string>
+#include <cstring>
+
+//If a folder exists
+bool dirExists(char* dirName);
+bool dirExists(std::string dirName);
+//Create a new folder
+bool makeDir(char* dirName);
+bool makeDir(std::string dirName);
+
+//Create multilayer folder
+bool smartMakeDir(char* dirName);
+bool smartMakeDir(std::string dirName);
+
+#endif

interaction.cpp

@@ -74,7 +74,7 @@ string LearnOneWord::getWord() {
 
 void LearnOneWord::ask() {
   word = sstra->next(diffi);
-  cout << " @@@@diffi: " << diffi << endl;
+  //cout << " @@@@diffi: " << diffi << endl;
   fstra->setWord(word);
   cout << fstra->display();
 }
@@ -252,12 +252,3 @@ void Count::work() {
   cout << " " << cnt << endl << endl;
 }
 
-
-// -----------------
-
-
-Settings::Settings(Env* env) : Interaction(env) {
-}
-
-void Settings::work() {
-}

interaction.h

@@ -109,13 +109,5 @@ class Count : public Interaction {
 
 };
 
-class Settings : public Interaction {
-
-public:
-  Settings(Env* env);
-  void work();
-  
-};
-
 
 #endif

main_interface.h

@@ -3,6 +3,7 @@
 
 #include "interaction.h"
 #include "test.h"
+#include "settings.h"
 
 
 class MainInterface : public Interaction {