Skip to content

Commit

Permalink
Changed technique name from concentro to domino
Browse files Browse the repository at this point in the history
  • Loading branch information
aalshrif90 committed Dec 27, 2017
1 parent 9a3336e commit e147516
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 18 deletions.
Expand Up @@ -3,7 +3,7 @@
import org.schemaanalyst.data.Data;
import org.schemaanalyst.data.ValueLibrary;
import org.schemaanalyst.data.ValueMiner;
import org.schemaanalyst.data.generation.concentro.ConcentroDataGenerator;
import org.schemaanalyst.data.generation.domino.DominoDataGenerator;
import org.schemaanalyst.data.generation.cellinitialization.CellInitializer;
import org.schemaanalyst.data.generation.cellinitialization.DefaultCellInitializer;
import org.schemaanalyst.data.generation.cellinitialization.RandomCellInitializer;
Expand All @@ -26,6 +26,7 @@

/**
* Created by phil on 14/03/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public class DataGeneratorFactory {

Expand Down Expand Up @@ -145,20 +146,20 @@ public static RandomDataGenerator randomDefaultsGenerator(long randomSeed, int m



public static ConcentroDataGenerator concentroRandomGenerator(long randomSeed, int maxEvaluations, Schema schema) {
public static DominoDataGenerator dominoRandomGenerator(long randomSeed, int maxEvaluations, Schema schema) {
Random random = makeRandomNumberGenerator(randomSeed);

RandomCellValueGenerator randomCellValueGenerator = makeRandomCellValueGenerator(random, schema);
RandomCellInitializer randomCellInitializer = new RandomCellInitializer(randomCellValueGenerator);

return new ConcentroDataGenerator(
return new DominoDataGenerator(
random,
maxEvaluations,
randomCellValueGenerator,
randomCellInitializer);
}

public static ConcentroDataGenerator concentroAVSGenerator(long randomSeed, int maxEvaluations, Schema schema) {
public static DominoDataGenerator dominoAVSGenerator(long randomSeed, int maxEvaluations, Schema schema) {
Random random = makeRandomNumberGenerator(randomSeed);

DefaultCellInitializer defaultCellInitializer = new DefaultCellInitializer();
Expand All @@ -174,7 +175,7 @@ public static ConcentroDataGenerator concentroAVSGenerator(long randomSeed, int

avs.setTerminationCriterion(terminationCriterion);

return new ConcentroDataGenerator(
return new DominoDataGenerator(
random,
maxEvaluations,
randomCellValueGenerator,
Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;


import org.schemaanalyst.data.Data;
Expand All @@ -9,6 +9,7 @@

/**
* Created by phil on 27/02/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public class AVSExpressionPredicateFixer extends PredicateFixer {

Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.generation.cellvaluegeneration.RandomCellValueGenerator;
import org.schemaanalyst.data.generation.search.AlternatingValueSearch;
Expand All @@ -7,6 +7,7 @@

/**
* Created by phil on 13/10/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public class AndPredicateFixer extends ComposedPredicateFixer {

Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.generation.cellvaluegeneration.RandomCellValueGenerator;
import org.schemaanalyst.data.generation.search.AlternatingValueSearch;
Expand All @@ -11,6 +11,7 @@

/**
* Created by phil on 13/10/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public abstract class ComposedPredicateFixer extends PredicateFixer {

Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.Data;
import org.schemaanalyst.data.generation.DataGenerationReport;
Expand All @@ -13,22 +13,23 @@

/**
* Created by phil on 26/02/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public class ConcentroDataGenerator extends RandomDataGenerator {
public class DominoDataGenerator extends RandomDataGenerator {

private Random random;
private AlternatingValueSearch avs;
private PredicateChecker predicateChecker;
private PredicateFixer predicateFixer;

public ConcentroDataGenerator(Random random,
public DominoDataGenerator(Random random,
int maxEvaluations,
RandomCellValueGenerator cellValueGenerator,
CellInitializer cellInitializer) {
this(random, maxEvaluations, cellValueGenerator, cellInitializer, null);
}

public ConcentroDataGenerator(Random random,
public DominoDataGenerator(Random random,
int maxEvaluations,
RandomCellValueGenerator cellValueGenerator,
CellInitializer cellInitializer,
Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.Cell;
import org.schemaanalyst.data.Row;
Expand All @@ -13,7 +13,9 @@

/**
* Created by phil on 27/02/2014.
* Updated by Abdullah Summer/Fall 2017
*/

public class MatchPredicateFixer extends PredicateFixer {

private MatchPredicateChecker matchPredicateChecker;
Expand Down
@@ -1,10 +1,11 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.Cell;
import org.schemaanalyst.testgeneration.coveragecriterion.predicate.checker.NullPredicateChecker;

/**
* Created by phil on 13/10/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public class NullPredicateFixer extends PredicateFixer {

Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.generation.cellvaluegeneration.RandomCellValueGenerator;
import org.schemaanalyst.data.generation.search.AlternatingValueSearch;
Expand All @@ -7,7 +7,9 @@

/**
* Created by phil on 13/10/2014.
* Updated by Abdullah Summer/Fall 2017
*/

public class OrPredicateFixer extends ComposedPredicateFixer {

private Random random;
Expand Down
@@ -1,7 +1,8 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

/**
* Created by phil on 27/02/2014.
* Updated by Abdullah Summer/Fall 2017
*/
public abstract class PredicateFixer {

Expand Down
@@ -1,4 +1,4 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.generation.cellvaluegeneration.RandomCellValueGenerator;
import org.schemaanalyst.data.generation.search.AlternatingValueSearch;
Expand All @@ -8,7 +8,9 @@

/**
* Created by phil on 13/10/2014.
* Updated by Abdullah Summer/Fall 2017
*/

public class PredicateFixerFactory {

public static PredicateFixer instantiate(final PredicateChecker predicateChecker,
Expand Down
@@ -1,12 +1,14 @@
package org.schemaanalyst.data.generation.concentro;
package org.schemaanalyst.data.generation.domino;

import org.schemaanalyst.data.Cell;
import org.schemaanalyst.data.generation.cellvaluegeneration.RandomCellValueGenerator;
import org.schemaanalyst.testgeneration.coveragecriterion.predicate.checker.ExpressionPredicateChecker;

/**
* Created by phil on 27/02/2014.
* Updated by Abdullah Summer/Fall 2017
*/

public class RandomExpressionPredicateFixer extends PredicateFixer {

private ExpressionPredicateChecker expressionPredicateChecker;
Expand Down

0 comments on commit e147516

Please sign in to comment.