tasks_generator 1.4 → 1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 89b702044292b9e3fd8b049809fab43889864f27
+  data.tar.gz: ede3a145bb98bf42f0c5bdc4c2f5373cd794f005
+SHA512:
+  metadata.gz: cd683f242dff57aed1d8a6009dd571f25491d7f83ca3ab6a26ead00bb4df43c2c164f46d19d6a9f43b1adb8069206319e1aab171a7165f9b15d8efaafbd94513
+  data.tar.gz: 6f779020b2a36bcf7cf2a9214f7a701ee4ff784d08ea38976e02d865f06aa802ef2bf3027880f98a8f0ec86619f148a5537fc41adadaff18cdb167417854a807

data/ext/tasks_generator/config.h

@@ -33,7 +33,7 @@ struct config_t {
   }
 };
 
-std::ostream& operator << (std::ostream& out, config_t const &config) {
+inline std::ostream& operator << (std::ostream& out, config_t const &config) {
   out << "config.life_time = " << config.life_time << std::endl;
   out << "config.population_size = " << config.population_size << std::endl;
   out << "config.mutation_chance = " << config.mutation_chance << std::endl;

data/ext/tasks_generator/generator.cc

@@ -0,0 +1,33 @@
+#include "generator.h"
+
+#include <unordered_map>
+#include <vector>
+
+namespace ailab {
+
+void generator_t::mark_second_levels(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)
+    topic_id_to_index[topics[i].get_topic_id()] = i;
+  for (size_t i = 0; i < topics.size(); ++i)
+    if (topic_id_to_index.find(topics[i].get_parent_id()) != topic_id_to_index.end())
+      topic_index_to_parent_index[i] = topic_id_to_index[topics[i].get_parent_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];
+      while (true) {
+        if (topic_index_to_parent_index.find(topic_index) == topic_index_to_parent_index.end())
+          break;
+        size_t parent_index = topic_index_to_parent_index[topic_index];
+        if (topic_index_to_parent_index.find(parent_index) == topic_index_to_parent_index.end())
+          break;
+        topic_index = parent_index;
+      }
+      q.set_second_level_topic_id(topics[topic_index].get_topic_id());
+    }
+  }
+}
+
+}

data/ext/tasks_generator/generator.h

@@ -119,23 +119,28 @@ class generator_t {
     return true;
   }
 
+  void mark_second_levels(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 :
+  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) {
+      topics(topics_),
+      questions(questions_) {
+    mark_second_levels(questions, topics);
   }
 
-  generator_t(config_t &&cnf, std::vector<topic_t> &&topics, std::vector<question_t> &&questions) noexcept :
+  generator_t(config_t &&cnf, std::vector<topic_t> &&topics_, std::vector<question_t> &&questions_) noexcept :
       config(cnf),
-      topics(topics),
-      questions(questions) {
+      topics(topics_),
+      questions(questions_) {
+    mark_second_levels(questions, topics);
   }
 
   generator_t(generator_t const &other) noexcept :
       config(other.config),
       topics(other.topics),
       questions(other.questions) {
+    mark_second_levels(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, select_id;
+  size_t question_id, topic_id, difficulty, second_level_topic_id;
   std::string text;
 
  public:
@@ -13,15 +13,16 @@ class question_t {
       question_id(question_id),
       topic_id(topic_id),
       difficulty(difficulty),
+      second_level_topic_id(0),
       text(text) {
   }
 
-  void set_select_id(size_t x) noexcept {
-    select_id = x;
+  void set_second_level_topic_id(size_t x) noexcept {
+    second_level_topic_id = x;
   }
 
-  size_t get_select_id() const noexcept {
-    return select_id;
+  size_t get_second_level_topic_id() const noexcept {
+    return second_level_topic_id;
   }
 
   size_t get_question_id() const noexcept {

data/ext/tasks_generator/question_shaker.h

@@ -54,7 +54,6 @@ class question_shaker_t {
       throw std::logic_error("Not enough questions for topic");
     size_t r = rand() % questions.at(topic_id).size();
     question_t result = questions.at(topic_id)[r];
-    result.set_select_id(topic_id);
     return result;
   }
 };

data/ext/tasks_generator/variants.h

@@ -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_second_level_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;
+      }
+    }
     {
       for (size_t i = 0; i < questions.size(); ++i) {
         size_t buffer[questions[i].size()];

data/lib/tasks_generator/version.rb

@@ -1,3 +1,3 @@
 module TasksGenerator
-  VERSION = "1.4"
+  VERSION = "1.5"
 end

data/tasks_generator.gemspec

@@ -22,7 +22,8 @@ spec = Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "bundler", "~> 1.6"
   spec.add_runtime_dependency "rake"
-  spec.add_runtime_dependency "rice"
+  spec.add_runtime_dependency "rake-compiler", ">= 0.9.5"
+  spec.add_runtime_dependency "rice", ">= 1.7.0"
 
   spec.platform = Gem::Platform::RUBY
   spec.extensions = %w[ext/tasks_generator/extconf.rb]

metadata

@@ -1,64 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: tasks_generator
 version: !ruby/object:Gem::Version
-  version: '1.4'
-  prerelease: 
+  version: '1.5'
 platform: ruby
 authors:
 - Arslan Urtashev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 description: Test Tasks Generator for AI lab MEPhI
 email:
 - urtashev@gmail.com
@@ -74,6 +81,7 @@ files:
 - ext/tasks_generator/bindings.cc
 - ext/tasks_generator/config.h
 - ext/tasks_generator/extconf.rb
+- ext/tasks_generator/generator.cc
 - ext/tasks_generator/generator.h
 - ext/tasks_generator/question.h
 - ext/tasks_generator/question_shaker.h
@@ -85,26 +93,25 @@ files:
 homepage: https://github.com/Avitella/tasks_generator
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Test Tasks Generator
 test_files: []