From 1834543564eec1c40ab650f4aec4120c38ffdb6b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 8 May 2017 13:39:19 +0200 Subject: [PATCH] Rearranged transformation sort order in database --- ZRColaCompile/main.cpp | 10 ++++++---- output/data/ZRCola.zrcdb | Bin 3642522 -> 3642522 bytes 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index 867231d..18ccce7 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -69,10 +69,12 @@ public: inline bool operator<(_In_ const com_translation& other) const { - if (rank < other.rank) return true; - else if (rank > other.rank) return false; - else if (src < other.src ) return true; - else return false; + if (src.str < other.src.str ) return true; + else if (src.str > other.src.str ) return false; + else if (src.rank < other.src.rank) return true; + else if (src.rank > other.src.rank) return false; + else if (rank < other.rank ) return true; + else return false; } inline bool operator<=(_In_ const com_translation &other) const diff --git a/output/data/ZRCola.zrcdb b/output/data/ZRCola.zrcdb index e0eb58a26abe747d7bfcfff1022c69922e090b2e..0d4c4194e3fbe5b0d97beca3ea6a93b14c428218 100644 GIT binary patch delta 4807 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 H{>wiBQEE#h delta 4936 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