From 5bd306d09bebefe4a3a18c539616f9ecf4f601a1 Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Sat, 22 Mar 2014 20:07:17 -0400
Subject: [PATCH] Actually use the simulated annealing setting.

---
 BPTCEncoder/src/CompressionMode.h |  6 ++++--
 BPTCEncoder/src/Compressor.cpp    | 20 +++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/BPTCEncoder/src/CompressionMode.h b/BPTCEncoder/src/CompressionMode.h
index 693ea40..5bff270 100755
--- a/BPTCEncoder/src/CompressionMode.h
+++ b/BPTCEncoder/src/CompressionMode.h
@@ -105,10 +105,11 @@ class CompressionMode {
   // This initializes the compression variables used in order to compress a list
   // of clusters. We can increase the speed a tad by specifying whether or not
   // the block is opaque or not.
-  explicit CompressionMode(int mode, ErrorMetric metric)
+  explicit CompressionMode(int mode, const CompressionSettings &settings)
     : m_IsOpaque(mode < 4)
     , m_Attributes(&(kModeAttributes[mode]))
-    , m_ErrorMetric(metric)
+    , m_SASteps(settings.m_NumSimulatedAnnealingSteps)
+    , m_ErrorMetric(settings.m_ErrorMetric)
     , m_RotateMode(0)
     , m_IndexMode(0)
   { }
@@ -185,6 +186,7 @@ class CompressionMode {
   const double m_IsOpaque;
   const Attributes *const m_Attributes;
 
+  int m_SASteps;
   ErrorMetric m_ErrorMetric;
   int m_RotateMode;
   int m_IndexMode;
diff --git a/BPTCEncoder/src/Compressor.cpp b/BPTCEncoder/src/Compressor.cpp
index f264796..1879172 100755
--- a/BPTCEncoder/src/Compressor.cpp
+++ b/BPTCEncoder/src/Compressor.cpp
@@ -260,8 +260,6 @@ const uint32 kInterpolationValues[4][16][2] = {
     {30, 34}, {26, 38}, {21, 43}, {17, 47}, {13, 51}, {9, 55}, {4, 60}, {0, 64}}
 };
 
-int CompressionMode::MaxAnnealingIterations = 50;  // This is a setting.
-
 CompressionMode::Attributes
 CompressionMode::kModeAttributes[kNumModes] = {
   // Mode 0
@@ -666,7 +664,7 @@ double CompressionMode::OptimizeEndpointsForCluster(
   visitedStates[lastVisitedState].pBitCombo = curPbitCombo;
   lastVisitedState++;
 
-  const int maxEnergy = MaxAnnealingIterations;
+  const int maxEnergy = this->m_SASteps;
 
   for(int energy = 0; bestError > 0 && energy < maxEnergy; energy++) {
 
@@ -1842,8 +1840,8 @@ static ShapeSelection BoxSelection(
   return result;
 }
 
-static void CompressClusters(ShapeSelection selection, const uint32 pixels[16],
-                             ErrorMetric metric, uint8 *outBuf,
+static void CompressClusters(const ShapeSelection &selection, const uint32 pixels[16],
+                             const CompressionSettings &settings, uint8 *outBuf,
                              double *errors, int *modeChosen) {
   RGBACluster cluster(pixels);
   uint8 tmpBuf[16];
@@ -1853,14 +1851,15 @@ static void CompressClusters(ShapeSelection selection, const uint32 pixels[16],
   // Block mode zero only has four bits for the partition index,
   // so if the chosen three-partition shape is not within this range,
   // then we shouldn't consider using this block mode...
+  uint32 selectedModes = selection.m_SelectedModes;
   if(selection.m_ThreeShapeIndex >= 16) {
-    selection.m_SelectedModes &= ~(static_cast<uint32>(eBlockMode_Zero));
+    selectedModes &= ~(static_cast<uint32>(eBlockMode_Zero));
   }
 
   for(uint32 modeIdx = 0; modeIdx < 8; modeIdx++) {
 
     uint32 mode = modes[modeIdx];
-    if((selection.m_SelectedModes & (1 << mode)) == 0) {
+    if((selectedModes & (1 << mode)) == 0) {
       continue;
     }
 
@@ -1875,7 +1874,7 @@ static void CompressClusters(ShapeSelection selection, const uint32 pixels[16],
       shape, CompressionMode::GetAttributesForMode(mode)->numSubsets);
 
     BitStream tmpStream(tmpBuf, 128, 0);
-    double error = CompressionMode(mode, metric).Compress(tmpStream, shape, cluster);
+    double error = CompressionMode(mode, settings).Compress(tmpStream, shape, cluster);
 
     if(errors)
       errors[mode] = error;
@@ -1928,7 +1927,7 @@ static void CompressBC7Block(const uint32 x, const uint32 y,
     selectionFn(x, y, block, userData);
   selection.m_SelectedModes &= settings.m_BlockModes;
   assert(selection.m_SelectedModes);
-  CompressClusters(selection, block, settings.m_ErrorMetric, outBuf, NULL, NULL);
+  CompressClusters(selection, block, settings, outBuf, NULL, NULL);
 }
 
 static double EstimateTwoClusterErrorStats(
@@ -2247,8 +2246,7 @@ static void CompressBC7Block(
 
   selection.m_SelectedModes &= settings.m_BlockModes;
   assert(selection.m_SelectedModes);
-  ErrorMetric metric = settings.m_ErrorMetric;
-  CompressClusters(selection, block, metric, outBuf, modeError, &bestMode);
+  CompressClusters(selection, block, settings, outBuf, modeError, &bestMode);
 
   PrintStat(logStream, kBlockStatString[eBlockStat_Path], path);
 }