keegan_csmith / watercomp / changeset / ace6f671364f

Up to file-list code/components/Permutation.cpp:

@@ -9,12 +9,12 @@ std::string get_permutation_env()
+{
     char * perm = getenv("PERMUTATION");
     if (!perm)
-        return "best";
+        return "optimal";
     else return perm;
+}
 const char * perm_error_msg = "ERROR: PERMUTATION environment variable must "
-    "be 'null', 'naive', 'delta', 'interframe' or 'best' (default)\n";
+    "be 'null', 'naive', 'delta', 'interframe' or 'optimal' (default)\n";
 PermutationWriter * PermutationWriter::get_writer(ArithmeticEncoder * enc,
                                                   int size)
@@ -28,8 +28,8 @@ PermutationWriter * PermutationWriter::g
         return new DeltaPermutationWriter(enc);
     if (perm == "interframe")
         return new InterframePermutationWriter(enc, size);
     if (perm == "best")
         return new BestPermutationWriter(enc, size);
     if (perm == "optimal")
         return new OptimalPermutationWriter(enc, size);
     fprintf(stderr, "%s", perm_error_msg);
     exit(1);
+}
@@ -47,8 +47,8 @@ PermutationReader * PermutationReader::g
         return new DeltaPermutationReader(dec);
     if (perm == "interframe")
         return new InterframePermutationReader(dec, size);
     if (perm == "best")
         return new BestPermutationReader(dec, size);
     if (perm == "optimal")
         return new OptimalPermutationReader(dec, size);
     fprintf(stderr, "%s", perm_error_msg);
     exit(1);
+}
@@ -117,7 +117,7 @@ int DeltaPermutationReader::next_index()
 //
-// BestPermutation
+// OptimalPermutation
 //
 IndexToSymbol::IndexToSymbol(int size)
@@ -166,14 +166,14 @@ void IndexToSymbol::reset()
+}
-BestPermutationWriter::BestPermutationWriter(ArithmeticEncoder * enc,
+OptimalPermutationWriter::OptimalPermutationWriter(ArithmeticEncoder * enc,
                                              int size)
     : m_enc(enc), m_indicies(size)
+{
+}
-void BestPermutationWriter::next_index(int index)
+void OptimalPermutationWriter::next_index(int index)
+{
     int size = m_indicies.size();
     int val  = m_indicies.pop_index(index);
@@ -181,14 +181,14 @@ void BestPermutationWriter::next_index(i
+}
-BestPermutationReader::BestPermutationReader(ArithmeticDecoder * dec,
+OptimalPermutationReader::OptimalPermutationReader(ArithmeticDecoder * dec,
                                              int size)
     : m_dec(dec), m_indicies(size)
+{
+}
-int BestPermutationReader::next_index()
+int OptimalPermutationReader::next_index()
+{
     int val = m_dec->decode(m_indicies.size());
     m_dec->decoder_update(val, val+1);

Up to file-list code/components/Permutation.h:

@@ -97,7 +97,7 @@ private:
 };
-// BestPermutation encodes values using an arithmetic coder where as each
+// OptimalPermutation encodes values using an arithmetic coder where as each
 // value is encoded, it's symbol is removed from the arithmetic coder
 // frequency table
 class IndexToSymbol
@@ -114,10 +114,10 @@ private:
     std::vector<int> m_symbols;
 };
-class BestPermutationWriter : public PermutationWriter
+class OptimalPermutationWriter : public PermutationWriter
+{
 public:
-    BestPermutationWriter(ArithmeticEncoder * enc, int size);
+    OptimalPermutationWriter(ArithmeticEncoder * enc, int size);
     void next_index(int index);
     void reset() { m_indicies.reset(); }
 private:
@@ -125,10 +125,10 @@ private:
     IndexToSymbol m_indicies;
 };
-class BestPermutationReader : public PermutationReader
+class OptimalPermutationReader : public PermutationReader
+{
 public:
-    BestPermutationReader(ArithmeticDecoder * dec, int size);
+    OptimalPermutationReader(ArithmeticDecoder * dec, int size);
     int next_index();
     void reset() { m_indicies.reset(); }
 private:

Up to file-list code/verifiers/testsuite.py:

@@ -11,7 +11,7 @@ import time
 RESULTS      = os.path.expanduser('~/dcd_results')
 QUANTISATION = ['8', '12']#, '16']
-PERMUTATIONS = 'null best naive interframe delta'.split()
+PERMUTATIONS = 'null optimal naive interframe delta'.split()
 CMD_PATH     = os.path.abspath(sys.argv[0])
 WORKING_DIR  = os.path.dirname(os.path.dirname(CMD_PATH))
 INPUT_DIR    = os.path.expanduser('~/dcd_input')

commit 381:	ace6f671364f
parent 379:	476437758982
branch:	default