fixed level calculating

Author: ZXCroon

env.cpp

@@ -90,11 +90,11 @@ void Env::calcLevel() {
       ratio = 0.5;
     }
     else {
-      (double)statList[i]->getKnown() / statList[i]->getTotal();
+      ratio = (double)statList[i]->getKnown() / statList[i]->getTotal();
     }
     if (ratio > 0.9) {
       basic->setLevel((i + 1) * (LEVEL_MAX / DIFFI_NUM)
-                      + (LEVEL_MAX / DIFFI_NUM) * ratio * 0.5);
+                      + (LEVEL_MAX / DIFFI_NUM) * ratio * 0.8);
       if (basic->getLevel() > LEVEL_MAX) {
         basic->setLevel(LEVEL_MAX);
       }

env.h

@@ -2,6 +2,8 @@
 #define ENV_H
 
 #include <fstream>
+#include <cstdlib>
+#include <ctime>
 #include "util.h"
 #include "info.h"
 #include "def.h"

interaction.cpp

@@ -74,6 +74,7 @@ string LearnOneWord::getWord() {
 
 void LearnOneWord::ask() {
   word = sstra->next(diffi);
+  cout << " @@@@diffi: " << diffi << endl;
   fstra->setWord(word);
   cout << fstra->display();
 }

program.cpp

@@ -11,9 +11,10 @@ void Program::show() {
   login();
   for (;;) {
     //TODO
-    RandomSelection* rs = new RandomSelection(env);
+    //RandomSelection* rs = new RandomSelection(env);
+    SmartSelection* ss = new SmartSelection(env);
     RemOrNotForm* ronf = new RemOrNotForm();
-    MainInterface mi(env, rs, ronf);
+    MainInterface mi(env, ss, ronf);
     mi.work();
     if (mi.toQuit()) {
       break;

strategy.cpp

@@ -1,6 +1,7 @@
 #include "strategy.h"
 
 SelectStrategy::SelectStrategy(Env* env) : env(env), diffi(0) {
+  srand(time(0));
 }
 
 string SelectStrategy::next(int& difficulty) {
@@ -67,7 +68,6 @@ RandomSelection::RandomSelection(Env* env) : SelectStrategy(env) {
 }
 
 int RandomSelection::chooseDifficulty() {
-  srand(time(0));
   return rand() % DIFFI_NUM;
 }
 

user/userlist.dat

@@ -0,0 +1 @@
+!ZXCroon

vocabulary/def.dat

@@ -1214,7 +1214,7 @@
 }
 
 *feel* {
-#n. an intuitive awareness; #
+#n. an intuitive awareness;#
 #n. the general atmosphere of a place or situation and the effect that it has on people#
 #n. a property perceived by touch#
 #v. undergo an emotional sensation or be in a particular state of mind#