Skip to content

Commit

Permalink
#1205 Backmerge: Reagent located at the bottom of the arrow when open…
Browse files Browse the repository at this point in the history 
…ing the RXN V2000 and V3000 files are located on top of the arrow (#1219)

Co-authored-by: Aliakasndr Dziarkach <[email protected]>
  • Loading branch information
@AliaksandrDziarkach
AliaksandrDziarkach and Aliakasndr Dziarkach authored Aug 9, 2023
1 parent c773384 commit feec2a2
Show file tree
Hide file tree
Showing 7 changed files with 166 additions and 67 deletions.
1 change: 1 addition & 0 deletions api/tests/integration/ref/reaction/save_ket_layout_1205.py.out
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test passed
132 changes: 66 additions & 66 deletions api/tests/integration/tests/layout/ref/932-agents.ket
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,31 @@
{
"type": "plus",
"location": [
2.96875,
-0.06698718667030335,
4.59999942779541,
-5.960464477539063e-8,
0.0
]
},
{
"type": "plus",
"location": [
6.65625,
10.199999809265137,
0.0,
0.0
]
},
{
"type": "plus",
"location": [
32.26663589477539,
56.54255676269531,
0.0,
0.0
]
},
{
"type": "plus",
"location": [
38.11834716796875,
65.60529327392578,
0.0,
0.0
]
Expand All @@ -78,12 +78,12 @@
"mode": "open-angle",
"pos": [
{
"x": 10.375,
"y": 0.0,
"x": 15.399999618530274,
"y": -1.1920928955078126e-7,
"z": 0.0
},
{
"x": 28.79788589477539,
"x": 52.34255599975586,
"y": 0.0,
"z": 0.0
}
Expand All @@ -99,23 +99,23 @@
"label": "C",
"location": [
0.0,
0.3660256266593933,
0.6928202509880066,
0.0
]
},
{
"label": "C",
"location": [
1.0000001192092896,
0.3660256266593933,
1.5999997854232789,
0.6928202509880066,
0.0
]
},
{
"label": "C",
"location": [
0.5000000596046448,
-0.5,
0.7999998927116394,
-0.6928203701972961,
0.0
]
}
Expand Down Expand Up @@ -150,7 +150,7 @@
{
"label": "S",
"location": [
4.9375,
7.59999942779541,
0.0,
0.0
]
Expand All @@ -164,32 +164,32 @@
{
"label": "C",
"location": [
8.375,
0.5000000596046448,
12.800000190734864,
0.7999997735023499,
0.0
]
},
{
"label": "C",
"location": [
9.375,
0.5000000596046448,
14.399999618530274,
0.7999997735023499,
0.0
]
},
{
"label": "C",
"location": [
9.375,
-0.5000000596046448,
14.399999618530274,
-0.800000011920929,
0.0
]
},
{
"label": "C",
"location": [
8.375,
-0.5000000596046448,
12.800000190734864,
-0.800000011920929,
0.0
]
}
Expand Down Expand Up @@ -231,7 +231,7 @@
{
"label": "S",
"location": [
30.79788589477539,
54.34255599975586,
0.0,
0.0
]
Expand All @@ -245,64 +245,64 @@
{
"label": "C",
"location": [
35.4424934387207,
1.2071070671081544,
61.47392272949219,
1.931370735168457,
0.0
]
},
{
"label": "C",
"location": [
34.4424934387207,
1.2071070671081544,
59.873924255371097,
1.931370735168457,
0.0
]
},
{
"label": "C",
"location": [
33.73538589477539,
0.5000001192092896,
58.7425537109375,
0.7999999523162842,
0.0
]
},
{
"label": "C",
"location": [
33.73538589477539,
-0.5000000596046448,
58.7425537109375,
-0.7999998331069946,
0.0
]
},
{
"label": "C",
"location": [
34.4424934387207,
-1.2071070671081544,
59.873924255371097,
-1.931370735168457,
0.0
]
},
{
"label": "C",
"location": [
35.4424934387207,
-1.2071070671081544,
61.47392272949219,
-1.931370735168457,
0.0
]
},
{
"label": "C",
"location": [
36.14959716796875,
-0.5000000596046448,
62.60529327392578,
-0.7999998331069946,
0.0
]
},
{
"label": "C",
"location": [
36.14959716796875,
0.5000001192092896,
62.60529327392578,
0.7999999523162842,
0.0
]
}
Expand Down Expand Up @@ -372,7 +372,7 @@
{
"label": "O",
"location": [
40.08709716796875,
68.60529327392578,
0.0,
0.0
]
Expand All @@ -386,24 +386,24 @@
{
"label": "C",
"location": [
10.760640144348145,
1.062500238418579,
16.0,
2.0,
0.0
]
},
{
"label": "C",
"location": [
11.626666069030762,
0.5625,
17.38564109802246,
1.1999999284744266,
0.0
]
},
{
"label": "C",
"location": [
12.492690086364746,
1.0625,
18.77128028869629,
1.999999761581421,
0.0
]
}
Expand Down Expand Up @@ -431,8 +431,8 @@
{
"label": "C",
"location": [
14.43018913269043,
1.0,
22.77128028869629,
1.600000023841858,
0.0
]
}
Expand All @@ -445,8 +445,8 @@
{
"label": "P",
"location": [
17.30518913269043,
1.0,
29.171279907226564,
1.600000023841858,
0.0
]
}
Expand All @@ -459,24 +459,24 @@
{
"label": "C",
"location": [
19.628332138061525,
1.062500238418579,
33.17127990722656,
2.0,
0.0
]
},
{
"label": "C",
"location": [
20.494356155395509,
0.5625,
34.55691909790039,
1.1999999284744266,
0.0
]
},
{
"label": "C",
"location": [
21.36038398742676,
1.0625,
35.94256210327149,
1.999999761581421,
0.0
]
}
Expand Down Expand Up @@ -504,24 +504,24 @@
{
"label": "C",
"location": [
22.36038589477539,
1.366025686264038,
37.54256057739258,
2.29282021522522,
0.0
]
},
{
"label": "C",
"location": [
23.36038589477539,
1.366025686264038,
39.14255905151367,
2.29282021522522,
0.0
]
},
{
"label": "C",
"location": [
22.86038589477539,
0.5,
38.342559814453128,
0.9071796536445618,
0.0
]
}
Expand Down Expand Up @@ -556,8 +556,8 @@
{
"label": "F",
"location": [
24.98538589477539,
1.0,
42.34255599975586,
1.600000023841858,
0.0
]
}
Expand All @@ -570,8 +570,8 @@
{
"label": "I",
"location": [
27.23538589477539,
1.0,
47.142555236816409,
1.600000023841858,
0.0
]
}
Expand Down
1 change: 1 addition & 0 deletions api/tests/integration/tests/reaction/reactions/issue_1205.ket
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"root":{"nodes":[{"$ref":"mol0"},{"$ref":"mol1"},{"$ref":"mol2"},{"$ref":"mol3"},{"type":"arrow","data":{"mode":"open-angle","pos":[{"x":10.515000343322754,"y":-8.324899673461914,"z":0.0},{"x":15.034599304199219,"y":-8.274900436401368,"z":0.0}]}}]},"mol0":{"type":"molecule","atoms":[{"label":"C","location":[7.7846999168396,-7.824999809265137,0.0]},{"label":"C","location":[9.515000343322754,-7.82450008392334,0.0]},{"label":"C","location":[8.65149974822998,-7.324900150299072,0.0]},{"label":"C","location":[9.515000343322754,-8.825400352478028,0.0]},{"label":"C","location":[7.7846999168396,-8.829899787902832,0.0]},{"label":"C","location":[8.65369987487793,-9.324899673461914,0.0]}],"bonds":[{"type":2,"atoms":[2,0]},{"type":2,"atoms":[3,1]},{"type":1,"atoms":[0,4]},{"type":1,"atoms":[1,2]},{"type":2,"atoms":[4,5]},{"type":1,"atoms":[5,3]}]},"mol1":{"type":"molecule","atoms":[{"label":"C","location":[16.03459930419922,-7.775000095367432,0.0]},{"label":"C","location":[17.76499938964844,-7.774499893188477,0.0]},{"label":"C","location":[16.90139961242676,-7.274899959564209,0.0]},{"label":"C","location":[17.76499938964844,-8.775400161743164,0.0]},{"label":"C","location":[16.03459930419922,-8.779899597167969,0.0]},{"label":"C","location":[16.903600692749025,-9.274900436401368,0.0]}],"bonds":[{"type":2,"atoms":[2,0]},{"type":2,"atoms":[3,1]},{"type":1,"atoms":[0,4]},{"type":1,"atoms":[1,2]},{"type":2,"atoms":[4,5]},{"type":1,"atoms":[5,3]}]},"mol2":{"type":"molecule","atoms":[{"label":"Cl","location":[12.974800109863282,-8.824899673461914,0.0]}],"bonds":[]},"mol3":{"type":"molecule","atoms":[{"label":"N","location":[12.549799919128418,-7.724899768829346,0.0]}],"bonds":[]}}
Loading

0 comments on commit feec2a2

Please sign in to comment.