Commit 02d6be8e authored by  tawada's avatar tawada
Browse files

update

parent a3d6f273
Loading
Loading
Loading
Loading
+5 −4
Changes for solver.py: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ def print_cnf(nodes, cnfs, filename='p.txt'):
            #s.append(s_sub)
    #print(''.join(s))

def print_cnf2(num, cnfs, filename='p.txt'):
def print_cnf2(nodes, cnfs, filename='p.txt'):
    num = len(nodes)
    s = []
    s.append(f'p cnf {num} {len(cnfs)}\n')
    for cnf in cnfs:
@@ -1382,7 +1383,7 @@ def ensemble_strA(A):

def main():
    
    Q = readQ('./adc2019problem/Q001_10X10_b8_l11.txt')
    #Q = readQ('./adc2019problem/Q001_10X10_b8_l11.txt')
    #Q = readQ('./adc2019problem/Q002_10X10_b8_l9.txt')
    #Q = readQ('./adc2019problem/Q003_10X10_b5_l5.txt')
    #Q = readQ('./adc2019problem/Q004_10X10_b8_l9.txt')
@@ -1395,11 +1396,11 @@ def main():
    #Q = readQ('./adc2019problem/Q013_10X10_b8_l9.txt')
    #Q = readQ('./adc2019problem/Q014_10X10_b9_l9.txt')
    #Q = readQ('./adc2019problem/Q015_10X10_b8_l9.txt')
    #Q = readQ('./adc2019problem/QRAND327_20X20_b20_l15.txt')
    Q = readQ('./adc2019problem/QRAND327_20X20_b20_l15.txt')
    #Q = readQ('./adc2019problem/QRAND368_10X10_b10_l15.txt')
    #Q = readQ('./adc2019problem/random_problem/QRAND136_30X30_b30_l30.txt')

    mode = 3
    mode = 1

    if mode == 1:
        # cell-line variables