tasks_generator 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a506cf0002cd930cf5180dcabbff7bef77f729ac
-  data.tar.gz: ab91148fd235307b40fedbedc5673fdfc936ecb1
+  metadata.gz: c08164423ef585060d6bc5070ddf9bac8dd508b9
+  data.tar.gz: 34d7a9995983b89002de5473da70439c13a65b7d
 SHA512:
-  metadata.gz: 50d326baa8fca58103b4210fb4a6f985cf05dc61c72d808ba753f9770f4ba316f7e3995fd86392438a7e1739fa9d1fe4978892f5259ae44ded6cd17406466fbf
-  data.tar.gz: f529a4d9de561caba1ff7e036c0c2ba802223aa4376dd224177e918ca370cf295aa72ed55e71d6a2f15aeaf8bad0752ae06fc6618de3daf0d2749d919d32998a
+  metadata.gz: 90e73e35e189bf932acd9322607a101ee05ee537f4acd0f801451b7a16550e361ee437b279e728794f3eadfd14b904f18c1d5a9b052c8126795c79e0db7d630b
+  data.tar.gz: 0dc220d5fea54faa04abd690e81334c748ad5880a374c7a5fb81f3e12b9154974b327a05b98ec2832af88405be5f125d55fe25bd808c28dd9b5ca17286857d0a

data/ext/tasks_generator/variants.h

@@ -102,24 +102,24 @@ class variants_t {
       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_second_level_topic_id();
+          buffer[j] = questions[i][j].get_question_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();
+        fitness += count == questions[i].size();
       }
     }
     {
       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_question_id();
+          buffer[j] = questions[i][j].get_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 += count == questions[i].size();
+        fitness += double(count) * 100.0 / questions[i].size();
       }
     }
     {
@@ -128,10 +128,16 @@ class variants_t {
         for (size_t j = 0; j < questions[i].size(); ++j)
           buffer[j] = questions[i][j].get_topic_id();
         std::sort(buffer, buffer + questions[i].size());
-        size_t count = 1;
+        size_t count = 0;
         for (size_t j = 1; j < questions[i].size(); ++j)
-          count += buffer[j] != buffer[j - 1];
-        fitness += double(count) * 100.0 / questions[i].size();
+          if (buffer[j] == buffer[j - 1]) {
+            ++count;
+          } else if (count > 0) {
+            fitness += 10.0 / count;
+            count = 0;
+          }
+        if (count > 0)
+          fitness += 10.0 / count;
       }
     }
     {

data/lib/tasks_generator/version.rb

@@ -1,3 +1,3 @@
 module TasksGenerator
-  VERSION = "2.0"
+  VERSION = "2.1"
 end

metadata

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