[1/2] bigtop git commit: BIGTOP-1918. Add product enumeration to BPS data generato

Sat, 11 Jul 2015 09:34:03 -0700 

Repository: bigtop
Updated Branches:
  refs/heads/master 6fd647e9c -> 89393913a


http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestProductCategoryMarkovModelSampler.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestProductCategoryMarkovModelSampler.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestProductCategoryMarkovModelSampler.java
index e32994b..89303f6 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestProductCategoryMarkovModelSampler.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestProductCategoryMarkovModelSampler.java
@@ -25,11 +25,11 @@ import 
org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import 
org.apache.bigtop.bigpetstore.datagenerator.framework.markovmodels.MarkovModel;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
 import 
org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.UniformSampler;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.ProductCategoryMarkovModelSampler;
 import org.junit.Test;
 
@@ -49,9 +49,6 @@ public class TestProductCategoryMarkovModelSampler
                foodBuilder.setAmountUsedPetPetAverage(1.0);
                foodBuilder.setAmountUsedPetPetVariance(1.0);
                foodBuilder.setDailyUsageRate(2.0);
-               foodBuilder.addFieldName(Constants.PRODUCT_CATEGORY);
-               foodBuilder.addFieldName(Constants.PRODUCT_QUANTITY);
-               foodBuilder.addFieldName("Flavor");
                foodBuilder.setCategory("dogFood");
                foodBuilder.addProduct(new 
Product(ImmutableMap.of(Constants.PRODUCT_CATEGORY, (Object) "dogFood",
                                Constants.PRODUCT_QUANTITY, (Object) 60.0, 
"Flavor", "Fish & Potato")));
@@ -66,9 +63,6 @@ public class TestProductCategoryMarkovModelSampler
                bagBuilder.setAmountUsedPetPetAverage(1.0);
                bagBuilder.setAmountUsedPetPetVariance(1.0);
                bagBuilder.setDailyUsageRate(2.0);
-               bagBuilder.addFieldName(Constants.PRODUCT_CATEGORY);
-               bagBuilder.addFieldName(Constants.PRODUCT_QUANTITY);
-               bagBuilder.addFieldName("Color");
                bagBuilder.setCategory("Poop Bags");
                bagBuilder.addProduct(new 
Product(ImmutableMap.of(Constants.PRODUCT_CATEGORY, (Object) "Poop Bags",
                                Constants.PRODUCT_QUANTITY, (Object) 60.0, 
"Color", "Blue")));

http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSampler.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSampler.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSampler.java
index 04a20f0..12efe13 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSampler.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSampler.java
@@ -24,9 +24,9 @@ import org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.MarkovPurchasingModel;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.PurchasingModelSamplerBuilder;
 import org.junit.Test;
@@ -46,9 +46,6 @@ public class TestPurchasingModelSampler
                foodBuilder.setAmountUsedPetPetAverage(1.0);
                foodBuilder.setAmountUsedPetPetVariance(1.0);
                foodBuilder.setDailyUsageRate(2.0);
-               foodBuilder.addFieldName(Constants.PRODUCT_CATEGORY);
-               foodBuilder.addFieldName(Constants.PRODUCT_QUANTITY);
-               foodBuilder.addFieldName("Flavor");
                foodBuilder.setCategory("dogFood");
                foodBuilder.addProduct(new 
Product(ImmutableMap.of(Constants.PRODUCT_CATEGORY, (Object) "dogFood",
                                Constants.PRODUCT_QUANTITY, (Object) 60.0, 
"Flavor", "Fish & Potato")));
@@ -63,9 +60,6 @@ public class TestPurchasingModelSampler
                bagBuilder.setAmountUsedPetPetAverage(1.0);
                bagBuilder.setAmountUsedPetPetVariance(1.0);
                bagBuilder.setDailyUsageRate(2.0);
-               bagBuilder.addFieldName(Constants.PRODUCT_CATEGORY);
-               bagBuilder.addFieldName(Constants.PRODUCT_QUANTITY);
-               bagBuilder.addFieldName("Color");
                bagBuilder.setCategory("Poop Bags");
                bagBuilder.addProduct(new 
Product(ImmutableMap.of(Constants.PRODUCT_CATEGORY, (Object) "Poop Bags",
                                Constants.PRODUCT_QUANTITY, (Object) 60.0, 
"Color", "Blue")));

http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSamplerBuilder.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSamplerBuilder.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSamplerBuilder.java
index 2255fc3..2d526ed 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSamplerBuilder.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/TestPurchasingModelSamplerBuilder.java
@@ -24,9 +24,9 @@ import org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.MarkovPurchasingModel;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.PurchasingModelSamplerBuilder;
 import org.junit.Test;
@@ -46,9 +46,6 @@ public class TestPurchasingModelSamplerBuilder
                foodBuilder.setAmountUsedPetPetAverage(1.0);
                foodBuilder.setAmountUsedPetPetVariance(1.0);
                foodBuilder.setDailyUsageRate(2.0);
-               foodBuilder.addFieldName(Constants.PRODUCT_CATEGORY);
-               foodBuilder.addFieldName(Constants.PRODUCT_QUANTITY);
-               foodBuilder.addFieldName("Flavor");
                foodBuilder.setCategory("dogFood");
                foodBuilder.addProduct(new 
Product(ImmutableMap.of(Constants.PRODUCT_CATEGORY, (Object) "dogFood",
                                Constants.PRODUCT_QUANTITY, (Object) 60.0, 
"Flavor", "Fish & Potato")));
@@ -63,9 +60,6 @@ public class TestPurchasingModelSamplerBuilder
                bagBuilder.setAmountUsedPetPetAverage(1.0);
                bagBuilder.setAmountUsedPetPetVariance(1.0);
                bagBuilder.setDailyUsageRate(2.0);
-               bagBuilder.addFieldName(Constants.PRODUCT_CATEGORY);
-               bagBuilder.addFieldName(Constants.PRODUCT_QUANTITY);
-               bagBuilder.addFieldName("Color");
                bagBuilder.setCategory("Poop Bags");
                bagBuilder.addProduct(new 
Product(ImmutableMap.of(Constants.PRODUCT_CATEGORY, (Object) "Poop Bags",
                                Constants.PRODUCT_QUANTITY, (Object) 60.0, 
"Color", "Blue")));

http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventory.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventory.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventory.java
index 6edb03d..322bb5e 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventory.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventory.java
@@ -24,9 +24,9 @@ import org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerInventory;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerTransactionParameters;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerTransactionParametersSamplerBuilder;

http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventoryBuilder.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventoryBuilder.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventoryBuilder.java
index fb147de..d8d6d70 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventoryBuilder.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestCustomerInventoryBuilder.java
@@ -24,9 +24,9 @@ import org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerInventory;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerInventoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerTransactionParameters;

http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestProductCategoryInventory.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestProductCategoryInventory.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestProductCategoryInventory.java
index 121f08c..dc08979 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestProductCategoryInventory.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestProductCategoryInventory.java
@@ -24,9 +24,9 @@ import org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerTransactionParameters;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CustomerTransactionParametersSamplerBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.ProductCategoryInventory;

http://git-wip-us.apache.org/repos/asf/bigtop/blob/89393913/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionPurchasesHiddenMarkovModel.java
----------------------------------------------------------------------
diff --git 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionPurchasesHiddenMarkovModel.java
 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionPurchasesHiddenMarkovModel.java
index 9d89410..6383c2e 100644
--- 
a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionPurchasesHiddenMarkovModel.java
+++ 
b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionPurchasesHiddenMarkovModel.java
@@ -25,12 +25,12 @@ import 
org.apache.bigtop.bigpetstore.datagenerator.Constants;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.PetSpecies;
 import org.apache.bigtop.bigpetstore.datagenerator.datamodels.Product;
 import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategory;
-import 
org.apache.bigtop.bigpetstore.datagenerator.datamodels.inputs.ProductCategoryBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.SeedFactory;
 import 
org.apache.bigtop.bigpetstore.datagenerator.framework.markovmodels.MarkovModel;
 import 
org.apache.bigtop.bigpetstore.datagenerator.framework.markovmodels.MarkovModelBuilder;
 import org.apache.bigtop.bigpetstore.datagenerator.framework.samplers.Sampler;
 import 
org.apache.bigtop.bigpetstore.datagenerator.framework.wfs.ConditionalWeightFunction;
+import 
org.apache.bigtop.bigpetstore.datagenerator.generators.products.ProductCategoryBuilder;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.MarkovPurchasingModel;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.purchase.PurchasingProcesses;
 import 
org.apache.bigtop.bigpetstore.datagenerator.generators.transaction.CategoryWeightFunction;

Reply via email to