diff --git a/mod/butadien/butadien.py b/mod/butadien/butadien.py index 6c02a58..236d72f 100644 --- a/mod/butadien/butadien.py +++ b/mod/butadien/butadien.py @@ -22,7 +22,9 @@ butadien = Graph.fromGMLString("""graph [ edge [ source 3 target 9 label "-" ] ]""", name="Butadien") -pentadien = Graph.fromGMLString("""graph [ +#pentadien = Graph.fromGMLString( +"""graph +[ node [ id 0 label "C" ] node [ id 1 label "C" ] node [ id 2 label "C" ] @@ -48,7 +50,9 @@ pentadien = Graph.fromGMLString("""graph [ edge [ source 9 target 10 label "-" ] edge [ source 9 target 11 label "-" ] edge [ source 9 target 12 label "-" ] -]""", name="Pentadien") +] +""" +#, name="Pentadien") restswap = Rule.fromGMLString( """rule [ @@ -111,7 +115,7 @@ dg = DG(graphDatabase=inputGraphs) dg.build().execute( addSubset(inputGraphs) >> rightPredicate[ - lambda d: all(g.vLabelCount("C") <= 6 for g in d.right) + lambda d: all(g.vLabelCount("C") <= 10 for g in d.right) ]( repeat(revive(inputRules)) #Revive not necessary ) @@ -122,11 +126,11 @@ postSection("Product Graphs") for a in dg.vertices: a.graph.print() -flowAutocata = Flow(dg) -flowAutocata.addSource(pentadien) -flowAutocata.findSolutions() -flowAutocata.solutions.list() -flowAutocata.solutions.print(flowPrinter) +#flow = Flow(dg) +#flow.addSource(butadien) +#flow.findSolutions() +#flow.solutions.list() +#flow.solutions.print(flowPrinter) sys.exit(0) diff --git a/mod/butadien/summaryButadien10C.pdf b/mod/butadien/summaryButadien10C.pdf new file mode 100644 index 0000000..21f921f Binary files /dev/null and b/mod/butadien/summaryButadien10C.pdf differ