tasks_generator 1.8 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b19015067da3f39d1bea51e7c22c8abb170d3f05
-  data.tar.gz: d7e478ed7d608617c9da8401d01d5b1b040dd35e
+  metadata.gz: a550ffc5a43041543931cb26d2cdec5eabddb128
+  data.tar.gz: d6b25723ace5bbbb41c2ceced196e99668bec6e3
 SHA512:
-  metadata.gz: 342f431e0cd418333f175c73f926ecef620dcb469de54c9d450dc91a6ae4d239c3660fc4663c3e529ead1296aa5dc67238e0fa4ad86b7d3e6486a9774b0a3261
-  data.tar.gz: 78a2e722c793c490e469b5dc79906ee2e27e2a4d576e0064516870bade3cf4c185fcbfc4f347cb239d179dd68322e6ad5c7a0ae4495422490655ad86612b389b
+  metadata.gz: ce0369a8f050ea1a3f18477b3f7d50e710f7538a995d29059eb969d761c05e0ab83ccf50fe5942d65f5f59e19b37d0fa73a9527cf306c4ecfb2324468abfc688
+  data.tar.gz: 640e9e50dd935964e0031f1cca35dfd8e86d80c34db0ecb48c64e0a19f2b94770bbfad9b83ef5a52a98e43e0fc0bd8e54a79654207bf7b2486dc7f4de1b84b20

data/ext/tasks_generator/generator.cc

@@ -5,7 +5,7 @@
 
 namespace ailab {
 
-void generator_t::mark_second_levels(std::vector<question_t> &questions, std::vector<topic_t> const &topics) noexcept {
+void generator_t::mark_questions(std::vector<question_t> &questions, std::vector<topic_t> const &topics) noexcept {
   std::unordered_map<size_t, size_t> topic_id_to_index;
   std::unordered_map<size_t, size_t> topic_index_to_parent_index;
   for (size_t i = 0; i < topics.size(); ++i)
@@ -28,6 +28,14 @@ void generator_t::mark_second_levels(std::vector<question_t> &questions, std::ve
       q.set_second_level_topic_id(topics[topic_index].get_topic_id());
     }
   }
+  for (question_t &q : questions) {
+    size_t topic_id = q.get_topic_id();
+    if (topic_id_to_index.find(topic_id) != topic_id_to_index.end()) {
+      size_t topic_index = topic_id_to_index[topic_id];
+      size_t parent_topic_id = topics[topic_index].get_parent_id();
+      q.set_parent_topic_id(parent_topic_id);
+    }
+  }
 }
 
 }

data/ext/tasks_generator/generator.h

@@ -119,28 +119,28 @@ class generator_t {
     return true;
   }
 
-  void mark_second_levels(std::vector<question_t> &questions, std::vector<topic_t> const &topics) noexcept;
+  void mark_questions(std::vector<question_t> &questions, std::vector<topic_t> const &topics) noexcept;
 
  public:
   generator_t(config_t const &cnf, std::vector<topic_t> const &topics_, std::vector<question_t> const &questions_) noexcept :
       config(cnf),
       topics(topics_),
       questions(questions_) {
-    mark_second_levels(questions, topics);
+    mark_questions(questions, topics);
   }
 
   generator_t(config_t &&cnf, std::vector<topic_t> &&topics_, std::vector<question_t> &&questions_) noexcept :
       config(cnf),
       topics(topics_),
       questions(questions_) {
-    mark_second_levels(questions, topics);
+    mark_questions(questions, topics);
   }
 
   generator_t(generator_t const &other) noexcept :
       config(other.config),
       topics(other.topics),
       questions(other.questions) {
-    mark_second_levels(questions, topics);
+    mark_questions(questions, topics);
   }
 
   variants_t generate() {

data/ext/tasks_generator/question.h

@@ -5,7 +5,7 @@
 namespace ailab {
 
 class question_t {
-  size_t question_id, topic_id, difficulty, second_level_topic_id;
+  size_t question_id, topic_id, difficulty, second_level_topic_id, parent_topic_id;
   std::string text;
 
  public:
@@ -14,6 +14,7 @@ class question_t {
       topic_id(topic_id),
       difficulty(difficulty),
       second_level_topic_id(0),
+      parent_topic_id(0),
       text(text) {
   }
 
@@ -25,6 +26,14 @@ class question_t {
     return second_level_topic_id;
   }
 
+  void set_parent_topic_id(size_t x) noexcept {
+    parent_topic_id = x;
+  }
+
+  size_t get_parent_topic_id() const noexcept {
+    return parent_topic_id;
+  }
+
   size_t get_question_id() const noexcept {
     return question_id;
   }

data/ext/tasks_generator/variants.h

@@ -70,8 +70,8 @@ class variants_t {
   }
 
   double calculate_fitness_function() const noexcept {
-    // if (!changed) 
-    //   return fitness;
+    if (!changed) 
+      return fitness;
     size_t questions_count = 0;
     for (auto const &v : questions)
       questions_count += v.size();
@@ -86,6 +86,18 @@ class variants_t {
         count += buffer[i] != buffer[i - 1];
       fitness = double(count) / questions_count;
     }
+    {
+      for (size_t i = 0; i < questions.size(); ++i) {
+        size_t buffer[questions[i].size()];
+        for (size_t j = 0; j < questions[i].size(); ++j)
+          buffer[j] = questions[i][j].get_parent_topic_id();
+        std::sort(buffer, buffer + questions[i].size());
+        size_t count = 1;
+        for (size_t j = 1; j < questions[i].size(); ++j)
+          count += buffer[j] != buffer[j - 1];
+        fitness += double(count) / questions[i].size();
+      }
+    }
     {
       for (size_t i = 0; i < questions.size(); ++i) {
         size_t buffer[questions[i].size()];
@@ -95,7 +107,7 @@ class variants_t {
         size_t count = 1;
         for (size_t j = 1; j < questions[i].size(); ++j)
           count += buffer[j] != buffer[j - 1];
-        fitness += count * 10 / questions[i].size();
+        fitness += double(count) / questions[i].size();
       }
     }
     {
@@ -119,7 +131,7 @@ class variants_t {
         size_t count = 1;
         for (size_t j = 1; j < questions[i].size(); ++j)
           count += buffer[j] != buffer[j - 1];
-        fitness += double(count) * 10.0 / questions[i].size();
+        fitness += double(count) / questions[i].size();
       }
     }
     {
@@ -171,7 +183,7 @@ class variants_t {
         fitness += x;
       }
     }
-    // changed = false;
+    changed = false;
     return fitness;
   }
 
@@ -208,6 +220,7 @@ class variants_t {
         }
       }
     }
+    changed = true;
   }
 
   std::vector<std::vector<question_t>> const &get_questions() const noexcept {

data/lib/tasks_generator/version.rb

@@ -1,3 +1,3 @@
 module TasksGenerator
-  VERSION = "1.8"
+  VERSION = "1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tasks_generator
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '1.9'
 platform: ruby
 authors:
 - Arslan Urtashev