Commit e5bb0f76 authored by Adam P. Goucher's avatar Adam P. Goucher
Browse files

Repaired problem arising from certain 0deg recipes not occurring in amphichiral forms

parent 87735b85
Pipeline #36991993 passed with stages
in 5 minutes and 44 seconds
......@@ -198,6 +198,10 @@ namespace apg {
scstream scs2("[0, 109, 90, 93, 91, 90, 95, 91, 91, 138, 157, 96, 90, 120, 91, 97, 107, 90, 90, 93, 188] 0move44");
scs2.concat(scs, 0);
zerodeg[scs.gouts[0].first].push_back(scs2);
scstream scs3("[0, 109, 91, 94, 91, 90, 96, 90, 91, 146, 240] 7move-1");
scs3.concat(scs, 0);
zerodeg[-scs.gouts[0].first].push_back(scs3);
}
}
......
......@@ -252,6 +252,17 @@ namespace apg {
std::vector<lanespec> paralanes;
std::string ba = "22$172bo$171bobo$170bobo$169bobo$168bobo$167bobo$166bobo$165bobo$";
ba += "164bobo$163bobo$162bobo$161bobo$160bobo$159bobo$158bobo$157bobo$156bob";
ba += "o$155bobo$154bobo$153bobo$154bo107$44bo$43bobo$42bobo$41bobo$40bobo$";
ba += "39bobo$38bobo$37bobo$36bobo$35bobo$34bobo$33bobo$32bobo$31bobo$30bobo$";
ba += "29bobo$28bobo$27bobo$26bobo$25bobo$26bo!";
pattern blocking_apparatus(lab, ba, "b3s23");
to_build += blocking_apparatus(bbox3[0], bbox3[1]);
cgsalvo<int64_t> cs = sparsebuild(to_build, bbox, bbox3, true);
for (auto ng = cs.gliders.begin(); ng != cs.gliders.end(); ++ng) {
int64_t il = ng->first - 3;
......@@ -269,7 +280,7 @@ namespace apg {
scs.concat(elbow_dup, 0);
for (auto it = paralanes.begin(); it != paralanes.end(); ++it) {
el.fire_parallel(scs, *it, middle);
if (!el.fire_parallel(scs, *it, middle)) { std::cerr << "Fatal error!" << std::endl; }
}
return true;
......
x = 8165, y = 8284, rule = B3/S23
8160b2o$8160bo$8162bo$8142b2o14b5o$8143bo13bo$8143bobo12b3o$8144b2o15b
o$8158b4o$8153b2o3bo3b2o$8153b2o4b3o2bo$8161bob2o$8161bo$8160b2o3$
8152b2o$8152bo$8153b3o$8155bo4157$4100bo$4098b3o$4097bo$4097b2o7$4087b
2o$4086bobo5b2o$4086bo7b2o$4085b2o2$4099bo$4095b2obobo$4094bobobobo$
4091bo2bobobobob2o$4091b4ob2o2bo2bo$4095bo4b2o$4093bobo$4093b2o4080$2b
2o$2b2o2$2b2o$bo2bo$o2bo$b2o!
x = 47, y = 75, rule = B3/S23
44bo$42b3o$41bo$41b2o5$20b2o$19bobo$19bo$18b2o3$23b2o$22bobo$22bo$21b
2o6$32b2o$32b2o$40b2o$40bo$41b3o$43bo2$42bo$41bobo$41bobo$40b2ob3o$46b
o$40b2ob3o$40b2obo2$32b2o$23b2o7b2o$24bo$24bobo$25b2o4$45b2o$45b2o5$
30bo$29bobo$29bobo$30bo$27b3o$27bo11$2b2o$2b2o2$2b2o$bo2bo$o2bo$b2o!
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment