Commit: 20ee3b22eaf7b142f8281d06f63f0f8aab107afb - factorio_calc (hg)

Just a simple, and painful to use calculator for the game Factorio written in Python

Commit MetaInfo

• Révision: 20ee3b22eaf7b142f8281d06f63f0f8aab107afb (tree)
• l'heure: 2018-02-03 05:31:16
• Auteur: Eric Hopper <hopper@omni...>
• Commiter: Eric Hopper

Message de Log

Arrange for XML to be sorted in a predictable order.

This will make the results of version controlling the resulting XML file
much saner.

Change Summary

• modified: factorio_calc.py

Modification

diff -r 462d2d0e4160 -r 20ee3b22eaf7 factorio_calc.py
--- a/factorio_calc.py	Fri Feb 02 10:37:30 2018 -0800
+++ b/factorio_calc.py	Fri Feb 02 12:31:16 2018 -0800
@@ -108,11 +108,32 @@
         elif not item_idmap[item][1]:
             raise RuntimeError(f"Circular reference detected '{item._name}'")
 
+    def sortedItems(self):
+        itemset = set(self)
+        sortedset = set()
+        sortedlist = []
+        curlst = []
+        while len(itemset) > 0:
+            for testitem in itemset:
+                ingredients = set((ingtuple[1] \
+                                   for ingtuple in testitem._ingredients))
+                if len(ingredients - sortedset) <= 0:
+                    curlst.append(testitem)
+            assert(len(curlst) > 0)
+            curset = frozenset(curlst)
+            itemset.difference_update(curset)
+            curlst.sort(key=lambda x: self._itemId(x))
+            sortedlist.extend(curlst)
+            sortedset.update(curset)
+            curset = None
+            curlst = []
+        return sortedlist
+
     def asXML(self):
         yield '<?xml version="1.0" encoding="utf-8" standalone="no" ?>\n'
-        yield '<factorio_calc_item_db>\n'
+        yield '<factorio_calc_item_db version="1.0">\n'
         item_idmap = {}
-        for item in self:
+        for item in self.sortedItems():
             yield from self._itemAsXML(item, item_idmap)
         yield '</factorio_calc_item_db>\n'