[66665] trunk/dports/science/sbsat

[snc at macports.org]

Revision: 66665
          http://trac.macports.org/changeset/66665
Author:   snc at macports.org
Date:     2010-04-19 08:06:22 -0700 (Mon, 19 Apr 2010)
Log Message:
-----------
fix slider3 generator

Modified Paths:
--------------
    trunk/dports/science/sbsat/Portfile
    trunk/dports/science/sbsat/files/slider3_base.py

Modified: trunk/dports/science/sbsat/Portfile
===================================================================
--- trunk/dports/science/sbsat/Portfile	2010-04-19 15:04:25 UTC (rev 66664)
+++ trunk/dports/science/sbsat/Portfile	2010-04-19 15:06:22 UTC (rev 66665)
@@ -5,7 +5,7 @@
 
 name                sbsat
 version             2.7b
-revision            2
+revision            3
 categories          science math
 maintainers         snc
 description         A state-based Satisfiability solver.

Modified: trunk/dports/science/sbsat/files/slider3_base.py
===================================================================
--- trunk/dports/science/sbsat/files/slider3_base.py	2010-04-19 15:04:25 UTC (rev 66664)
+++ trunk/dports/science/sbsat/files/slider3_base.py	2010-04-19 15:06:22 UTC (rev 66665)
@@ -52,8 +52,8 @@
 
 def slider3_sat(out_type, size, offset):
 	s = size/20
-	start1 = [1, 2*s+3, 2*s+1, size/2-1-3*s, size/2-1, size/2+1]
-	start2 = [1, 2*s-1, 2*s+2, size/2-1-4*s, size/2-1-2*s, size/2-1-s, size/2+1]
+	start1 = [1, 2*s+3, 2*s+1, size/2-1-3*s, size/2-1, size/2]
+	start2 = [1, 2*s-1, 2*s+2, size/2-1-4*s, size/2-1-2*s, size/2-1-s, size/2]
 	'''
 	print >> sys.stderr, start1
 	print >> sys.stderr, start2
@@ -75,7 +75,7 @@
 	print("#define add_state2(1, 2, 3, 4, 5, 6)")
 	print("#xor(-1, xor(3, and(-4, 5), 4), equ(6, 2))")
 	print("#define add_state3(1, 2, 3, 4, 5, 6)")
-	print("#xor(-1, xor(3, and(-4, 5), 4), equ(6, 2))")
+	print("#not(xor(-1, xor(3, and(-4, 5), 4), equ(6, 2)))")
 	for i in range(0, size-size/2+offset):
 		test = (i%2)+2
 		sys.stdout.write("add_state%d" % test)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100419/18a6640d/attachment.html>