BIGTOP-1919. Remove fixConditional methods in BPS data generator

10 files changed, 8 insertions, 80 deletions

diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/pdfs/ConditionalProbabilityDensityFunction.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/pdfs/ConditionalProbabilityDensityFunction.java
index f8798703..51617612 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/pdfs/ConditionalProbabilityDensityFunction.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/pdfs/ConditionalProbabilityDensityFunction.java
@@ -18,6 +18,4 @@ package org.apache.bigtop.bigpetstore.datagenerator.framework.pdfs;
 public interface ConditionalProbabilityDensityFunction<T, S>
 {
 	public double probability(T datum, S conditionalDatum);
-	
-	public ProbabilityDensityFunction<T> fixConditional(S conditionalDatum);
 }
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/samplers/ConditionalSampler.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/samplers/ConditionalSampler.java
index 54506e22..c521333c 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/samplers/ConditionalSampler.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/samplers/ConditionalSampler.java
@@ -18,6 +18,4 @@ package org.apache.bigtop.bigpetstore.datagenerator.framework.samplers;
 public interface ConditionalSampler<T, S>
 {
 	public T sample(S conditional) throws Exception;
-	
-	public Sampler<T> fixConditional(S conditional) throws Exception;
 }
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/wfs/ConditionalWeightFunction.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/wfs/ConditionalWeightFunction.java
index 21d01096..603e5e99 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/wfs/ConditionalWeightFunction.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/framework/wfs/ConditionalWeightFunction.java
@@ -18,6 +18,4 @@ package org.apache.bigtop.bigpetstore.datagenerator.framework.wfs;
 public interface ConditionalWeightFunction<T, S>
 {
 	public double weight(T datum, S given);
-	
-	public WeightFunction<T> fixConditional(S given);
 }
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/CustomerSamplerBuilder.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/CustomerSamplerBuilder.java
index 209b0994..4b449e84 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/CustomerSamplerBuilder.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/CustomerSamplerBuilder.java
@@ -62,11 +62,6 @@ public class CustomerSamplerBuilder
 					{
 						return locationSamplers.get(store).sample();
 					}
-					
-					public Sampler<ZipcodeRecord> fixConditional(Store store)
-					{
-						return locationSamplers.get(store);
-					}
 				};
 	}
 	
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/PurchasingProcesses.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/PurchasingProcesses.java
index 746026be..d9a98493 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/PurchasingProcesses.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/purchase/PurchasingProcesses.java
@@ -36,10 +36,4 @@ public class PurchasingProcesses implements ConditionalSampler<Product, String>
 	{
 		return this.processes.get(productCategory).sample();
 	}
-	
-	public Sampler<Product> fixConditional(String productCategory) throws Exception
-	{
-		return this.processes.get(productCategory);
-	}
-
 }
\ No newline at end of file
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/CategoryWeightFunction.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/CategoryWeightFunction.java
index 10f195e3..09b7327c 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/CategoryWeightFunction.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/CategoryWeightFunction.java
@@ -33,19 +33,7 @@ public class CategoryWeightFunction implements ConditionalWeightFunction<Double,
 	@Override
 	public double weight(Double exhaustionTime, Double transactionTime)
 	{
-		return fixConditional(transactionTime).weight(exhaustionTime);
-	}
-	
-	@Override
-	public WeightFunction<Double> fixConditional(final Double transactionTime)
-	{
-		return new WeightFunction<Double>()
-			{
-				public double weight(Double exhaustionTime)
-				{
-					double remainingTime = Math.max(0.0, exhaustionTime - transactionTime);
-					return pdf.probability(remainingTime);
-				}
-			};
+		double remainingTime = Math.max(0.0, exhaustionTime - transactionTime);
+		return pdf.probability(remainingTime);
 	}
 }
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionPurchasesHiddenMarkovModel.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionPurchasesHiddenMarkovModel.java
index 8e6bd787..83924e35 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionPurchasesHiddenMarkovModel.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionPurchasesHiddenMarkovModel.java
@@ -105,17 +105,4 @@ public class TransactionPurchasesHiddenMarkovModel implements ConditionalSampler
 		
 		return purchasedProducts;
 	}
-	
-	public Sampler<List<Product>> fixConditional(final Double transactionTime)
-	{
-		final ConditionalSampler<List<Product>, Double> sampler = this;
-		return new Sampler<List<Product>>()
-		{
-			public List<Product> sample() throws Exception
-			{
-				return sampler.sample(transactionTime);
-			}
-		};
-	}
-	
 }
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionTimePDF.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionTimePDF.java
index 72dcc04e..b2b284f8 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionTimePDF.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/main/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TransactionTimePDF.java
@@ -16,30 +16,16 @@
 package org.apache.bigtop.bigpetstore.datagenerator.generators.transaction;
 
 import org.apache.bigtop.bigpetstore.datagenerator.framework.pdfs.ConditionalProbabilityDensityFunction;
-import org.apache.bigtop.bigpetstore.datagenerator.framework.pdfs.ProbabilityDensityFunction;
 
 public class TransactionTimePDF implements ConditionalProbabilityDensityFunction<Double, Double>
 {	
 	public double probability(Double proposedTime, Double lastTransactionTime)
 	{
-		return fixConditional(lastTransactionTime).probability(proposedTime);
-	}
-	
-	public ProbabilityDensityFunction<Double> fixConditional(final Double lastTransactionTime)
-	{
-		return new ProbabilityDensityFunction<Double>()
-			{
-				public double probability(Double proposedTransactionTime)
-				{
-					if(proposedTransactionTime >= lastTransactionTime)
-					{
-						return 1.0;
-					}
-					else
-					{
-						return 0.0;
-					}
-				}
-			};
+		if(proposedTime >= lastTransactionTime)
+		{
+			return 1.0;
+		}
+
+		return 0.0;
 	}
 }
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/TestCustomerSampler.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/TestCustomerSampler.java
index 5865a837..380d9f08 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/TestCustomerSampler.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/customer/TestCustomerSampler.java
@@ -61,11 +61,6 @@ public class TestCustomerSampler
 					{
 						return locationSamplers.get(store).sample();
 					}
-					
-					public Sampler<ZipcodeRecord> fixConditional(Store store)
-					{
-						return locationSamplers.get(store);
-					}
 				};
 	}
 
diff --git a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionTimePDF.java b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionTimePDF.java
index 8c57f849..6c2bf310 100644
--- a/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionTimePDF.java
+++ b/bigtop-bigpetstore/bigpetstore-data-generator/src/test/java/org/apache/bigtop/bigpetstore/datagenerator/generators/transaction/TestTransactionTimePDF.java
@@ -32,15 +32,4 @@ public class TestTransactionTimePDF
 		assertEquals(pdf.probability(0.5, 0.5), 1.0, 0.000001);
 		assertEquals(pdf.probability(0.75, 0.5), 1.0, 0.000001);
 	}
-	
-	@Test
-	public void testFixConditional() throws Exception
-	{
-		TransactionTimePDF pdf = new TransactionTimePDF();
-		
-		assertEquals(pdf.fixConditional(0.75).probability(0.5), 0.0, 0.000001);
-		assertEquals(pdf.fixConditional(0.5).probability(0.5), 1.0, 0.000001);
-		assertEquals(pdf.fixConditional(0.5).probability(0.75), 1.0, 0.000001);
-	}
-
 }