Skip to content

Commit

Permalink
Database name CLI arg.
Browse files Browse the repository at this point in the history
  • Loading branch information
LorenzBuehmann committed Sep 23, 2016
1 parent 3275f7a commit 8cd03fb
Showing 1 changed file with 16 additions and 3 deletions.
Expand Up @@ -229,6 +229,8 @@ enum Baseline {
// "Pakistan"
);

String databaseName;

public PRConvergenceExperiment(EvaluationDataset dataset, File benchmarkDirectory, boolean write2DB, boolean override, int maxQTLRuntime, boolean useEmailNotification, int nrOfThreads) {
this.dataset = dataset;
this.benchmarkDirectory = benchmarkDirectory;
Expand Down Expand Up @@ -264,6 +266,8 @@ public PRConvergenceExperiment(EvaluationDataset dataset, File benchmarkDirector
cacheDirectory = new File(benchmarkDirectory, "cache");

filter = dataset.getPredicateFilter();

databaseName = "QTL_" + dataset.getName() + "_" + timeStamp;
}

private void setupDatabase() {
Expand All @@ -280,9 +284,8 @@ private void setupDatabase() {
java.sql.Statement stmt = conn.createStatement();

// create database
String databaseName = "QTL_" + dataset.getName() + "_" + timeStamp;
logger.info("Creating database '" + databaseName + "'");
String sql = "CREATE DATABASE " + databaseName;
logger.info("Creating database " + databaseName + "'");
String sql = "CREATE DATABASE IF NOT EXISTS" + databaseName;
stmt.executeUpdate(sql);
logger.info("Database created successfully.");

Expand Down Expand Up @@ -426,6 +429,10 @@ public void setQueriesToOmitTokens(Set<String> queriesToOmitTokens) {
this.queriesToOmitTokens = queriesToOmitTokens;
}

public void setDatabaseName(String databaseName) {
this.databaseName = databaseName;
}

public void run(int maxNrOfProcessedQueries, int maxTreeDepth, int[] exampleInterval, double[] noiseInterval, HeuristicType[] measures) throws Exception{
this.maxTreeDepth = maxTreeDepth;
queryTreeFactory.setMaxDepth(maxTreeDepth);
Expand Down Expand Up @@ -1582,6 +1589,8 @@ public static void main(String[] args) throws Exception {
OptionSpec<String> queriesToOmitTokensSpec = parser.accepts("omitTokens", "comma-separated list of tokens such that queries containing any of them will be omitted").withRequiredArg().ofType(String.class).defaultsTo("");
OptionSpec<String> queriesToProcessTokensSpec = parser.accepts("processTokens", "comma-separated list of tokens such that queries containing any of them will be omitted").withRequiredArg().ofType(String.class).defaultsTo("");

OptionSpec<String> databaseNameSpec = parser.accepts("dbname", "database name").withRequiredArg().ofType(String.class);


OptionSet options = parser.parse(args);

Expand Down Expand Up @@ -1658,9 +1667,13 @@ public static void main(String[] args) throws Exception {
throw new RuntimeException("Unsupported dataset:" + datasetName);
}

String databaseName = options.valueOf(databaseNameSpec);


PRConvergenceExperiment eval = new PRConvergenceExperiment(dataset, benchmarkDirectory, write2DB, override, maxQTLRuntime, useEmailNotification, nrOfThreads);
eval.setQueriesToOmitTokens(omitTokens);
eval.setQueriesToProcessTokens(processTokens);
eval.setDatabaseName(databaseName);
eval.run(maxNrOfQueries, maxTreeDepth, exampleInterval, noiseInterval, measures);

// new QALDExperiment(Dataset.BIOMEDICAL).run();
Expand Down

0 comments on commit 8cd03fb

Please sign in to comment.