When guessing a palette, sort the palette to make it more predictable.

Guessed palettes sort each option. Update unit test files that are affected. Modify the performance test data, which would otherwise overflow. ---------------- real 0m0.343s user 0m0.276s sys 0m0.037s
dustmop · Oct 11, 2016 · f526732 · f526732
1 parent 40c51eb
commit f526732
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 3 deletions.
diff --git a/makechr/guess_best_palette.py b/makechr/guess_best_palette.py
@@ -163,7 +163,8 @@ def get_palette(self, possibilities):
     pal = palette.Palette()
     pal.set_bg_color(bg_color)
     for color_set in color_set_collection:
-      pal.add([bg_color] + [c for c in color_set if c != bg_color])
+      pal.add([bg_color] + sorted([c for c in color_set if c != bg_color],
+                                  reverse=True))
     return pal
 
   def guess_palette(self, color_needs_list):

diff --git a/makechr/res/perf_data.png b/makechr/res/perf_data.png
diff --git a/tests/testdata/combine-colors-palette.dat b/tests/testdata/combine-colors-palette.dat
@@ -1 +1 @@
-080	
+0(0	
diff --git a/tests/testdata/combine-colors.png b/tests/testdata/combine-colors.png
diff --git a/tests/testdata/full-image-chr-8x16.dat b/tests/testdata/full-image-chr-8x16.dat
diff --git a/tests/testdata/full-image-palette-sprite.dat b/tests/testdata/full-image-palette-sprite.dat
@@ -1 +1 @@
-00000000000000000800000000000
+00000000000000000800000000000
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		00000000000000000800000000000
		00000000000000000800000000000