Skip to content

Commit

Permalink
remove db path tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohnMount
JohnMount committed Apr 7, 2013
1 parent 491192a commit fa9b194
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 128 deletions.
67 changes: 0 additions & 67 deletions test/com/winvector/logistic/TestLRPath.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.ObjectInputStream;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
Expand All @@ -20,10 +19,6 @@

import org.junit.Test;

import com.winvector.db.DBIterable;
import com.winvector.db.DBUtil;
import com.winvector.db.DBUtil.DBHandle;
import com.winvector.db.LoadTable;
import com.winvector.logistic.mr.TestRoundTrip;
import com.winvector.opt.def.DModel;
import com.winvector.opt.def.Datum;
Expand Down Expand Up @@ -209,66 +204,4 @@ public void testTestScore() throws Exception {
resultFile.delete();
tmpDir.delete();
}







@Test
public void testDBPath() throws Exception {
// build DB connection
final String comment = "test";
final String dbUserName = "";
final String dbPassword = "";
final String driver = "org.h2.Driver";
final File tmpFile = File.createTempFile("TestH2DB",".dir");
tmpFile.delete();
tmpFile.mkdirs();
final String dbURL = "jdbc:h2:/" + (new File(tmpFile,"H2DB")).getAbsolutePath() + ";LOG=0;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0";
final boolean readOnly = false;
final DBHandle handle = DBUtil.buildConnection(comment,
dbUserName,
dbPassword,
dbURL,
driver,
readOnly);
// copy data into table
System.out.println("test db: " + handle);
final String tableName = "testTable";
final Iterable<BurstMap> source = TestLRPath.readBurstFromResource("com/winvector/logistic/uciCarTrain.tsv");
LoadTable.loadTable(source, null, tableName, handle);
// set up formula
final String formulaStr = "rating ~ buying + maintenance + doors + persons + lug_boot + safety";
final Formula f = new Formula(formulaStr);
// bring data back out of table
final Statement stmt = handle.conn.createStatement();
final StringBuilder query = new StringBuilder();
query.append("SELECT ");
{
boolean first = true;
for(final String term: f.allTerms()) {
if(first) {
first = false;
} else {
query.append(",");
}
query.append(term);
}
}
query.append(" FROM ");
query.append(tableName);
final Iterable<BurstMap> trainSource = new DBIterable(stmt,query.toString());
final Model model = (new LogisticTrain()).train(trainSource,f,null);
final SigmoidLossMultinomial sigmoidLoss = new SigmoidLossMultinomial(model.config.dim(),model.config.noutcomes());
final double trainAccuracy = HelperFns.accuracy(sigmoidLoss,new ExampleRowIterable(model.config,trainSource),model.coefs);
assertTrue(trainAccuracy>0.968);
handle.conn.close();
// clean up
for(final File ci: tmpFile.listFiles()) {
ci.delete();
}
tmpFile.delete();
}
}
61 changes: 0 additions & 61 deletions test/com/winvector/logistic/TestLRPathPlus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.ObjectInputStream;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
Expand All @@ -24,10 +23,6 @@

import org.junit.Test;

import com.winvector.db.DBIterable;
import com.winvector.db.DBUtil;
import com.winvector.db.DBUtil.DBHandle;
import com.winvector.db.LoadTable;
import com.winvector.logistic.mr.TestRoundTrip;
import com.winvector.opt.def.DModel;
import com.winvector.opt.def.Datum;
Expand Down Expand Up @@ -312,60 +307,4 @@ public void testVectorEncodingB() throws Exception {
System.out.println("train accuracy:" + trainAccuracy);
}
}

@Test
public void testDBPath() throws Exception {
// build DB connection
final String comment = "test";
final String dbUserName = "";
final String dbPassword = "";
final String driver = "org.h2.Driver";
final File tmpFile = File.createTempFile("TestH2DB",".dir");
tmpFile.delete();
tmpFile.mkdirs();
final String dbURL = "jdbc:h2:/" + (new File(tmpFile,"H2DB")).getAbsolutePath() + ";LOG=0;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0";
final boolean readOnly = false;
final DBHandle handle = DBUtil.buildConnection(comment,
dbUserName,
dbPassword,
dbURL,
driver,
readOnly);
// copy data into table
System.out.println("test db: " + handle);
final String tableName = "testTable";
final Iterable<BurstMap> source = TestLRPathPlus.readBurstFromResource("com/winvector/logistic/uciCarTrain.tsv");
LoadTable.loadTable(source, null, tableName, handle);
// set up formula
final String formulaStr = "rating ~ buying + maintenance + doors + persons + lug_boot + safety";
final Formula f = new Formula(formulaStr);
// bring data back out of table
final Statement stmt = handle.conn.createStatement();
final StringBuilder query = new StringBuilder();
query.append("SELECT ");
{
boolean first = true;
for(final String term: f.allTerms()) {
if(first) {
first = false;
} else {
query.append(",");
}
query.append(term);
}
}
query.append(" FROM ");
query.append(tableName);
final Iterable<BurstMap> trainSource = new DBIterable(stmt,query.toString());
final Model model = (new LogisticTrainPlus()).train(trainSource,f,null);
final SigmoidLossMultinomial sigmoidLoss = new SigmoidLossMultinomial(model.config.dim(),model.config.noutcomes());
final double trainAccuracy = HelperFns.accuracy(sigmoidLoss,new ExampleRowIterable(model.config,trainSource),model.coefs);
assertTrue(trainAccuracy>0.965);
handle.conn.close();
// clean up
for(final File ci: tmpFile.listFiles()) {
ci.delete();
}
tmpFile.delete();
}
}

0 comments on commit fa9b194

Please sign in to comment.