Merge remote-tracking branch 'upstream/master'

2 files changed, 8 insertions, 1 deletions

diff --git a/minrisk/minrisk.pl b/minrisk/minrisk.pl
index 99893a66..d05b9595 100755
--- a/minrisk/minrisk.pl
+++ b/minrisk/minrisk.pl
@@ -133,7 +133,7 @@ if ($metric =~ /^ter$|^aer$/i) {
 my $refs_comma_sep = get_comma_sep_refs('r',$refFiles);
 
 unless ($dir){
-	$dir = "rampion";
+	$dir = "minrisk";
 }
 unless ($dir =~ /^\//){  # convert relative path to absolute path
 	my $basedir = check_output("pwd");
diff --git a/minrisk/minrisk_optimize.cc b/minrisk/minrisk_optimize.cc
index 5096acc1..6e651994 100644
--- a/minrisk/minrisk_optimize.cc
+++ b/minrisk/minrisk_optimize.cc
@@ -105,6 +105,13 @@ int main(int argc, char** argv) {
   vector<weight_t> weights;
   const string weightsf = conf["weights"].as<string>();
   Weights::InitFromFile(weightsf, &weights);
+  double t = 0;
+  for (unsigned i = 0; i < weights.size(); ++i)
+    t += weights[i] * weights[i];
+  if (t > 0) {
+    for (unsigned i = 0; i < weights.size(); ++i)
+      weights[i] /= sqrt(t);
+  }
   string line, file;
   vector<training::CandidateSet> kis;
   cerr << "Loading hypergraphs...\n";