From c150bdea83a9f599b34832072a70af525e40b77a Mon Sep 17 00:00:00 2001 From: "trevor.cohn" Date: Sun, 18 Jul 2010 20:40:27 +0000 Subject: Changed to UTF8 git-svn-id: https://ws10smt.googlecode.com/svn/trunk@311 ec762483-ff6d-05da-a07a-a48fb63a330f --- .../prjava/src/io/FileUtil.java | 18 ++++++++++-------- .../prjava/src/phrase/Trainer.java | 8 ++++---- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'gi/posterior-regularisation') diff --git a/gi/posterior-regularisation/prjava/src/io/FileUtil.java b/gi/posterior-regularisation/prjava/src/io/FileUtil.java index 81e7747b..6720d087 100644 --- a/gi/posterior-regularisation/prjava/src/io/FileUtil.java +++ b/gi/posterior-regularisation/prjava/src/io/FileUtil.java @@ -8,24 +8,25 @@ public class FileUtil public static BufferedReader reader(File file) throws FileNotFoundException, IOException { if (file.getName().endsWith(".gz")) - return new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(file)))); + return new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(file)), "UTF8")); else - return new BufferedReader(new FileReader(file)); + return new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF8")); } public static PrintStream printstream(File file) throws FileNotFoundException, IOException { if (file.getName().endsWith(".gz")) - return new PrintStream(new GZIPOutputStream(new FileOutputStream(file))); + return new PrintStream(new GZIPOutputStream(new FileOutputStream(file)), true, "UTF8"); else - return new PrintStream(new FileOutputStream(file)); + return new PrintStream(new FileOutputStream(file), true, "UTF8"); } - public static Scanner openInFile(String filename){ + public static Scanner openInFile(String filename) + { Scanner localsc=null; try { - localsc=new Scanner (new FileInputStream(filename)); + localsc=new Scanner(new FileInputStream(filename), "UTF8"); }catch(IOException ioe){ System.out.println(ioe.getMessage()); @@ -33,10 +34,11 @@ public class FileUtil return localsc; } - public static FileInputStream openInputStream(String infilename){ + public static FileInputStream openInputStream(String infilename) + { FileInputStream fis=null; try { - fis =(new FileInputStream(infilename)); + fis = new FileInputStream(infilename); } catch (IOException ioe) { System.out.println(ioe.getMessage()); diff --git a/gi/posterior-regularisation/prjava/src/phrase/Trainer.java b/gi/posterior-regularisation/prjava/src/phrase/Trainer.java index d1322c26..7f0b1970 100644 --- a/gi/posterior-regularisation/prjava/src/phrase/Trainer.java +++ b/gi/posterior-regularisation/prjava/src/phrase/Trainer.java @@ -34,10 +34,10 @@ public class Trainer parser.accepts("agree"); parser.accepts("no-parameter-cache"); parser.accepts("skip-large-phrases").withRequiredArg().ofType(Integer.class).defaultsTo(5); - parser.accepts("rare-word").withRequiredArg().ofType(Integer.class).defaultsTo(0); - parser.accepts("rare-edge").withRequiredArg().ofType(Integer.class).defaultsTo(0); - parser.accepts("rare-phrase").withRequiredArg().ofType(Integer.class).defaultsTo(0); - parser.accepts("rare-context").withRequiredArg().ofType(Integer.class).defaultsTo(0); + parser.accepts("rare-word").withRequiredArg().ofType(Integer.class).defaultsTo(10); + parser.accepts("rare-edge").withRequiredArg().ofType(Integer.class).defaultsTo(1); + parser.accepts("rare-phrase").withRequiredArg().ofType(Integer.class).defaultsTo(2); + parser.accepts("rare-context").withRequiredArg().ofType(Integer.class).defaultsTo(2); OptionSet options = parser.parse(args); if (options.has("help") || !options.has("in")) -- cgit v1.2.3