onehot commander encoding

diff --git a/src/Test/serializestatictuner.cc b/src/Test/serializestatictuner.cc
index c23f18d3e374c5ea0dc0ac5a64b028839acbfba1..7cc467d9617ef46903c71e6ac1603309565d6dc8 100644 (file)
--- a/src/Test/serializestatictuner.cc
+++ b/src/Test/serializestatictuner.cc
@@ -23,25 +23,51 @@ int main(int argc, char **argv) {
                elem_bin->setVarTunable(0, MUSTREACHGLOBAL, &onoff, 1);
                elem_bin->setVarTunable(1, MUSTREACHGLOBAL, &onoff, 1);
                elem_bin->setVarTunable(2, MUSTREACHGLOBAL, &onoff, 1);
-                elem_bin->setVarTunable(0, MUSTREACHLOCAL, &onoff, 1);
-                elem_bin->setVarTunable(1, MUSTREACHLOCAL, &onoff, 1);
-                elem_bin->setVarTunable(2, MUSTREACHLOCAL, &onoff, 1);
-                elem_bin->setVarTunable(0, MUSTREACHPRUNE, &onoff, 1);
-                elem_bin->setVarTunable(1, MUSTREACHPRUNE, &onoff, 1);
-                elem_bin->setVarTunable(2, MUSTREACHPRUNE, &onoff, 1);
-                elem_bin->setVarTunable(0, MUSTEDGEPRUNE, &onoff, 1);
-                elem_bin->setVarTunable(1, MUSTEDGEPRUNE, &onoff, 1);
-                elem_bin->setVarTunable(2, MUSTEDGEPRUNE, &onoff, 1);
-                elem_bin->setTunable(OPTIMIZEORDERSTRUCTURE, &onoff, 1);
-                elem_bin->setTunable(MUSTVALUE, &mustValueBinaryIndex, 3);
+               elem_bin->setVarTunable(0, MUSTREACHLOCAL, &onoff, 1);
+               elem_bin->setVarTunable(1, MUSTREACHLOCAL, &onoff, 1);
+               elem_bin->setVarTunable(2, MUSTREACHLOCAL, &onoff, 1);
+               elem_bin->setVarTunable(0, MUSTREACHPRUNE, &onoff, 1);
+               elem_bin->setVarTunable(1, MUSTREACHPRUNE, &onoff, 1);
+               elem_bin->setVarTunable(2, MUSTREACHPRUNE, &onoff, 1);
+               elem_bin->setVarTunable(0, MUSTEDGEPRUNE, &onoff, 1);
+               elem_bin->setVarTunable(1, MUSTEDGEPRUNE, &onoff, 1);
+               elem_bin->setVarTunable(2, MUSTEDGEPRUNE, &onoff, 1);
+               elem_bin->setTunable(OPTIMIZEORDERSTRUCTURE, &onoff, 1);
+               elem_bin->setTunable(MUSTVALUE, &mustValueBinaryIndex, 3);
+               elem_bin->serialize("binarytuner.conf");
 
                elem_onehot->setTunable(NAIVEENCODER, &NaiveEncodingDesc, ONEHOT);
-               elem_unary->setTunable(NAIVEENCODER, &NaiveEncodingDesc, UNARY);
-               elem_bin->serialize("binarytuner.conf");
-               elem_unary->serialize("unarytuner.conf");
+               elem_onehot->setTunable(PREPROCESS, &onoff, 1);
+               elem_onehot->setTunable(DECOMPOSEORDER, &onoff, 1);
+               elem_onehot->setTunable(ORDERINTEGERENCODING, &offon, 0);
+               elem_onehot->setTunable(ELEMENTOPT, &onoff, 1);
+               elem_onehot->setTunable(ELEMENTOPTSETS, &onoff, 1);
+               elem_onehot->setTunable(ENCODINGGRAPHOPT, &offon, 0);
+               elem_onehot->setVarTunable(0, NODEENCODING, &NodeEncodingDesc, ELEM_UNASSIGNED);
+               elem_onehot->setVarTunable(1, NODEENCODING, &NodeEncodingDesc, ELEM_UNASSIGNED);
+               elem_onehot->setVarTunable(2, NODEENCODING, &NodeEncodingDesc, ELEM_UNASSIGNED);
+               elem_onehot->setTunable(VARIABLEORDER, &boolVarOrderingDesc, REVERSEORDERING);
+               elem_onehot->setTunable(PROXYVARIABLE, &proxyparameter, 2);
+               elem_onehot->setVarTunable(0, MUSTREACHGLOBAL, &onoff, 1);
+               elem_onehot->setVarTunable(1, MUSTREACHGLOBAL, &onoff, 1);
+               elem_onehot->setVarTunable(2, MUSTREACHGLOBAL, &onoff, 1);
+               elem_onehot->setVarTunable(0, MUSTREACHLOCAL, &onoff, 1);
+               elem_onehot->setVarTunable(1, MUSTREACHLOCAL, &onoff, 1);
+               elem_onehot->setVarTunable(2, MUSTREACHLOCAL, &onoff, 1);
+               elem_onehot->setVarTunable(0, MUSTREACHPRUNE, &onoff, 1);
+               elem_onehot->setVarTunable(1, MUSTREACHPRUNE, &onoff, 1);
+               elem_onehot->setVarTunable(2, MUSTREACHPRUNE, &onoff, 1);
+               elem_onehot->setVarTunable(0, MUSTEDGEPRUNE, &onoff, 1);
+               elem_onehot->setVarTunable(1, MUSTEDGEPRUNE, &onoff, 1);
+               elem_onehot->setVarTunable(2, MUSTEDGEPRUNE, &onoff, 1);
+               elem_onehot->setTunable(OPTIMIZEORDERSTRUCTURE, &onoff, 1);
+               elem_onehot->setTunable(MUSTVALUE, &mustValueBinaryIndex, 3);
                elem_onehot->serialize("onehottuner.conf");
                elem_onehot->setTunable(ONEHOTATMOSTONE, &OneHotAtMostOneDesc, ONEHOT_COMMANDER);
                elem_onehot->serialize("onehottunercommander.conf");
+               elem_unary->setTunable(NAIVEENCODER, &NaiveEncodingDesc, UNARY);
+               elem_unary->serialize("unarytuner.conf");
+               
                elem_bin->setTunable(ENCODINGGRAPHOPT, &offon, 1);
                elem_onehot->setTunable(ENCODINGGRAPHOPT, &offon, 1);
                elem_unary->setTunable(ENCODINGGRAPHOPT, &offon, 1);