Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx at 1aacd5e [master] Fix wrong function names.

susumu.yata null+****@clear*****
Tue Dec 16 10:52:57 JST 2014

• Previous message: [Groonga-commit] groonga/grnxx at c52b141 [master] Add a test for Text::contains(). (#118)
• Next message: [Groonga-commit] groonga/grnxx at 1fd480a [master] Enable tests for Sorter for Int, Float, and Text. (#112)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2014-11-27 14:06:30 +0900 (Thu, 27 Nov 2014)

  New Revision: 1aacd5e625b7264239d1443a5dc220f2a006a2ed
  https://github.com/groonga/grnxx/commit/1aacd5e625b7264239d1443a5dc220f2a006a2ed

  Message:
    Fix wrong function names.

  Modified files:
    benchmark/benchmark_sorter.cpp

  Modified: benchmark/benchmark_sorter.cpp (+50 -50)
===================================================================
--- benchmark/benchmark_sorter.cpp    2014-11-27 00:04:00 +0900 (c489827)
+++ benchmark/benchmark_sorter.cpp    2014-11-27 14:06:30 +0900 (2f3d36e)
@@ -192,20 +192,20 @@ void benchmark_int() {
   constexpr size_t NUM_ROWS = 1 << 21;
   auto db = grnxx::open_db("");
   auto table = db->create_table("Table");
-  auto float_1 = table->create_column("Float_1", grnxx::FLOAT_DATA);
-  auto float_2 = table->create_column("Float_2", grnxx::FLOAT_DATA);
-  auto float_3 = table->create_column("Float_3", grnxx::FLOAT_DATA);
+  auto int_1 = table->create_column("Int_1", grnxx::INT_DATA);
+  auto int_2 = table->create_column("Int_2", grnxx::INT_DATA);
+  auto int_3 = table->create_column("Int_3", grnxx::INT_DATA);
   std::mt19937_64 rng;
   for (size_t i = 0; i < NUM_ROWS; ++i) {
     grnxx::Int row_id = table->insert_row();
     if ((rng() % 4) != 0) {
-      float_1->set(row_id, grnxx::Float(1.0 * (rng() % 256) / 255));
+      int_1->set(row_id, grnxx::Int(rng() % 256));
     }
     if ((rng() % 4) != 0) {
-      float_2->set(row_id, grnxx::Float(1.0 * (rng() % 65536) / 65535));
+      int_2->set(row_id, grnxx::Int(rng() % 65536));
     }
     if ((rng() % 4) != 0) {
-      float_3->set(row_id, grnxx::Float(1.0 * rng() / rng.max()));
+      int_3->set(row_id, grnxx::Int(rng()));
     }
   }
 
@@ -217,7 +217,7 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(1);
-      expression_builder->push_column("Float_1");
+      expression_builder->push_column("Int_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -227,7 +227,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_1" << std::endl;
+    std::cout << "Int_1" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -239,7 +239,7 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(1);
-      expression_builder->push_column("Float_2");
+      expression_builder->push_column("Int_2");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -249,7 +249,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_2" << std::endl;
+    std::cout << "Int_2" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -261,7 +261,7 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(1);
-      expression_builder->push_column("Float_3");
+      expression_builder->push_column("Int_3");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -271,7 +271,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_3" << std::endl;
+    std::cout << "Int_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -283,10 +283,10 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(2);
-      expression_builder->push_column("Float_1");
+      expression_builder->push_column("Int_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Float_2");
+      expression_builder->push_column("Int_2");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -296,7 +296,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_1, Float_2" << std::endl;
+    std::cout << "Int_1, Int_2" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -308,10 +308,10 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(2);
-      expression_builder->push_column("Float_1");
+      expression_builder->push_column("Int_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Float_3");
+      expression_builder->push_column("Int_3");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -321,7 +321,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_1, Float_3" << std::endl;
+    std::cout << "Int_1, Int_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -333,10 +333,10 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(2);
-      expression_builder->push_column("Float_2");
+      expression_builder->push_column("Int_2");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Float_3");
+      expression_builder->push_column("Int_3");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -346,7 +346,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_2, Float_3" << std::endl;
+    std::cout << "Int_2, Int_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -358,13 +358,13 @@ void benchmark_int() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(3);
-      expression_builder->push_column("Float_1");
+      expression_builder->push_column("Int_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Float_2");
+      expression_builder->push_column("Int_2");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Float_3");
+      expression_builder->push_column("Int_3");
       orders[2].expression = std::move(expression_builder->release());
       orders[2].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -374,7 +374,7 @@ void benchmark_int() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Float_1, Float_2, Float_3" << std::endl;
+    std::cout << "Int_1, Int_2, Int_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 }
@@ -383,20 +383,20 @@ void benchmark_float() {
   constexpr size_t NUM_ROWS = 1 << 21;
   auto db = grnxx::open_db("");
   auto table = db->create_table("Table");
-  auto int_1 = table->create_column("Int_1", grnxx::INT_DATA);
-  auto int_2 = table->create_column("Int_2", grnxx::INT_DATA);
-  auto int_3 = table->create_column("Int_3", grnxx::INT_DATA);
+  auto float_1 = table->create_column("Float_1", grnxx::FLOAT_DATA);
+  auto float_2 = table->create_column("Float_2", grnxx::FLOAT_DATA);
+  auto float_3 = table->create_column("Float_3", grnxx::FLOAT_DATA);
   std::mt19937_64 rng;
   for (size_t i = 0; i < NUM_ROWS; ++i) {
     grnxx::Int row_id = table->insert_row();
     if ((rng() % 4) != 0) {
-      int_1->set(row_id, grnxx::Int(rng() % 256));
+      float_1->set(row_id, grnxx::Float(1.0 * (rng() % 256) / 255));
     }
     if ((rng() % 4) != 0) {
-      int_2->set(row_id, grnxx::Int(rng() % 65536));
+      float_2->set(row_id, grnxx::Float(1.0 * (rng() % 65536) / 65535));
     }
     if ((rng() % 4) != 0) {
-      int_3->set(row_id, grnxx::Int(rng()));
+      float_3->set(row_id, grnxx::Float(1.0 * rng() / rng.max()));
     }
   }
 
@@ -408,7 +408,7 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(1);
-      expression_builder->push_column("Int_1");
+      expression_builder->push_column("Float_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -418,7 +418,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_1" << std::endl;
+    std::cout << "Float_1" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -430,7 +430,7 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(1);
-      expression_builder->push_column("Int_2");
+      expression_builder->push_column("Float_2");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -440,7 +440,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_2" << std::endl;
+    std::cout << "Float_2" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -452,7 +452,7 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(1);
-      expression_builder->push_column("Int_3");
+      expression_builder->push_column("Float_3");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -462,7 +462,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_3" << std::endl;
+    std::cout << "Float_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -474,10 +474,10 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(2);
-      expression_builder->push_column("Int_1");
+      expression_builder->push_column("Float_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Int_2");
+      expression_builder->push_column("Float_2");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -487,7 +487,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_1, Int_2" << std::endl;
+    std::cout << "Float_1, Float_2" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -499,10 +499,10 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(2);
-      expression_builder->push_column("Int_1");
+      expression_builder->push_column("Float_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Int_3");
+      expression_builder->push_column("Float_3");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -512,7 +512,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_1, Int_3" << std::endl;
+    std::cout << "Float_1, Float_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -524,10 +524,10 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(2);
-      expression_builder->push_column("Int_2");
+      expression_builder->push_column("Float_2");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Int_3");
+      expression_builder->push_column("Float_3");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -537,7 +537,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_2, Int_3" << std::endl;
+    std::cout << "Float_2, Float_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 
@@ -549,13 +549,13 @@ void benchmark_float() {
       auto expression_builder = grnxx::ExpressionBuilder::create(table);
       grnxx::Array<grnxx::SorterOrder> orders;
       orders.resize(3);
-      expression_builder->push_column("Int_1");
+      expression_builder->push_column("Float_1");
       orders[0].expression = std::move(expression_builder->release());
       orders[0].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Int_2");
+      expression_builder->push_column("Float_2");
       orders[1].expression = std::move(expression_builder->release());
       orders[1].type = grnxx::SORTER_REGULAR_ORDER;
-      expression_builder->push_column("Int_3");
+      expression_builder->push_column("Float_3");
       orders[2].expression = std::move(expression_builder->release());
       orders[2].type = grnxx::SORTER_REGULAR_ORDER;
       auto sorter = grnxx::Sorter::create(std::move(orders));
@@ -565,7 +565,7 @@ void benchmark_float() {
         best_elapsed = elapsed;
       }
     }
-    std::cout << "Int_1, Int_2, Int_3" << std::endl;
+    std::cout << "Float_1, Float_2, Float_3" << std::endl;
     std::cout << "best elapsed [s] = " << best_elapsed << std::endl;
   }
 }
-------------- next part --------------
HTML����������������������������...
Télécharger 

• Previous message: [Groonga-commit] groonga/grnxx at c52b141 [master] Add a test for Text::contains(). (#118)
• Next message: [Groonga-commit] groonga/grnxx at 1fd480a [master] Enable tests for Sorter for Int, Float, and Text. (#112)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]