Restore development versioning and LSN filtering

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/misc.h b/src/misc.h
index 9bdcc633289236f0376d1908f097ecd6dc6ddfef..0e656cb2b0d08c11f99f1f89f01c0ac8fe7ae52e 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -38,7 +38,7 @@
 /// Version number.  If this is left empty, the current date (in the format
 /// YYMMDD) is used as a version number.
 
 /// Version number.  If this is left empty, the current date (in the format
 /// YYMMDD) is used as a version number.
 

-const std::string EngineVersion = "1.1a";
+const std::string EngineVersion = "";

 
 
 ////
 
 
 ////

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 054b6c1713b0b35ebff90653a8c5ae6c013ceb71..fa2a0cab342630862c4c61babc723c9678527729 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -128,7 +128,7 @@ namespace {
     o.push_back(Option("Futility Margin 2", 300, 0, 1000));
     o.push_back(Option("Maximum Razoring Depth", 3, 0, 4));
     o.push_back(Option("Razoring Margin", 300, 150, 600));
     o.push_back(Option("Futility Margin 2", 300, 0, 1000));
     o.push_back(Option("Maximum Razoring Depth", 3, 0, 4));
     o.push_back(Option("Razoring Margin", 300, 150, 600));

-    o.push_back(Option("LSN filtering", false));
+    o.push_back(Option("LSN filtering", true));

     o.push_back(Option("LSN Time Margin (sec)", 4, 1, 10));
     o.push_back(Option("LSN Value Margin", 200, 100, 600));
     o.push_back(Option("Randomness", 0, 0, 10));
     o.push_back(Option("LSN Time Margin (sec)", 4, 1, 10));
     o.push_back(Option("LSN Value Margin", 200, 100, 600));
     o.push_back(Option("Randomness", 0, 0, 10));