Merge pull request #29 from perrygeo/0.5release

0.5 release

CHANGES.md

@@ -1,3 +1,6 @@
+### 0.5.0
+- Allow move function to return energy delta for efficiency gains in some cases (#28)
+
 ### 0.4.2
 - Fix bug in load_state (#23)
 

examples/salesman.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 import math
 import random
@@ -28,6 +29,8 @@ def move(self):
         a = random.randint(0, len(self.state) - 1)
         b = random.randint(0, len(self.state) - 1)
         self.state[a], self.state[b] = self.state[b], self.state[a]
+        # no efficiency gain, just proof of concept
+        return self.energy()
 
     def energy(self):
         """Calculates the length of the route."""
@@ -37,7 +40,6 @@ def energy(self):
         return e
 
 
-
 if __name__ == '__main__':
 
     # latitude and longitude for the twenty largest U.S. cities
@@ -79,7 +81,7 @@ def energy(self):
                 distance_matrix[ka][kb] = distance(va, vb)
 
     tsp = TravellingSalesmanProblem(init_state, distance_matrix)
-    tsp.steps = 100000
+    tsp.set_schedule(tsp.auto(minutes=0.2))
     # since our state is just a list, slice is the fastest way to copy
     tsp.copy_strategy = "slice"
     state, e = tsp.anneal()
@@ -89,5 +91,4 @@ def energy(self):
 
     print()
     print("%i mile route:" % e)
-    for city in state:
-        print("\t", city)
+    print(" ➞  ".join(state))

simanneal/__init__.py

@@ -2,4 +2,4 @@
 from .anneal import Annealer
 
 __all__ = ['Annealer']
-__version__ = "0.4.2"
+__version__ = "0.5.0"