Skip to content

Commit

Permalink
Backmerge: #2213 - Layout for 1-step reactions is broken (#2214)
Browse files Browse the repository at this point in the history
  • Loading branch information
@even1024
even1024 authored Aug 12, 2024
1 parent f56299d commit 5eb60ce
Show file tree
Hide file tree
Showing 25 changed files with 1,067 additions and 475 deletions.
110 changes: 55 additions & 55 deletions api/tests/integration/ref/formats/cdx_to_ket.py.out
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/tests/integration/ref/formats/rxn_no_layout.py.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
{
"type": "plus",
"location": [
9.501733779907227,
9.501733779907229,
0.0,
0.0
]
},
{
"type": "plus",
"location": [
19.503467559814454,
19.503467559814458,
0.0,
0.0
]
Expand Down Expand Up @@ -69,7 +69,7 @@
{
"type": "plus",
"location": [
48.909507751464847,
48.90950775146485,
0.0,
0.0
]
Expand Down
2 changes: 2 additions & 0 deletions api/tests/integration/ref/layout/ket_layout.py.out
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*** KET LAYOUT ***
balance.ket:SUCCEED
2 changes: 1 addition & 1 deletion api/tests/integration/tests/formats/ket_cdxml.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def find_diff(a, b):

ket_result = ket.json()

# with open(os.path.join(ref_path, filename), "w") as file:
# with open(os.path.join(ref_path, filename + ".ket"), "w") as file:
# file.write(ket_result)

with open(os.path.join(ref_path, filename) + ".ket", "r") as file:
Expand Down
2 changes: 1 addition & 1 deletion api/tests/integration/tests/formats/ref/961-text_size.ket
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
{
"label": "C",
"location": [
12.442792892456055,
12.442792892456057,
-5.227451801300049,
0.0
]
Expand Down
12 changes: 6 additions & 6 deletions api/tests/integration/tests/formats/ref/agents.ket
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
{
"label": "C",
"location": [
16.395389556884767,
16.39538955688477,
-7.258016109466553,
0.0
]
Expand All @@ -229,15 +229,15 @@
{
"label": "C",
"location": [
16.395389556884767,
16.39538955688477,
-5.258028984069824,
0.0
]
},
{
"label": "C",
"location": [
16.395389556884767,
16.39538955688477,
-4.258035659790039,
0.0
]
Expand All @@ -246,15 +246,15 @@
"label": "C",
"location": [
15.529335975646973,
-3.7580387592315676,
-3.758038759231568,
0.0
]
},
{
"label": "C",
"location": [
14.663400650024414,
-3.2580418586730959,
-3.258041858673096,
0.0
]
},
Expand Down Expand Up @@ -361,7 +361,7 @@
{
"label": "Cl",
"location": [
10.475000381469727,
10.475000381469729,
-4.5,
0.0
]
Expand Down
2 changes: 1 addition & 1 deletion api/tests/integration/tests/formats/ref/generic.ket
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
{
"label": "C",
"location": [
3.3677926063537599,
3.36779260635376,
-4.227451324462891,
0.0
]
Expand Down
20 changes: 10 additions & 10 deletions api/tests/integration/tests/formats/ref/multi.ket
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
{
"x": 10.425000190734864,
"y": -3.7249999046325685,
"y": -3.724999904632569,
"z": 0.0
}
]
Expand Down Expand Up @@ -59,7 +59,7 @@
"type": "plus",
"location": [
4.400000095367432,
-3.6500000953674318,
-3.650000095367432,
0.0
]
},
Expand Down Expand Up @@ -95,7 +95,7 @@
{
"label": "C",
"location": [
3.5285041332244875,
3.5285041332244879,
-3.127451181411743,
0.0
]
Expand Down Expand Up @@ -267,7 +267,7 @@
{
"label": "C",
"location": [
23.426637649536134,
23.426637649536138,
-2.549967050552368,
0.0
]
Expand Down Expand Up @@ -348,7 +348,7 @@
{
"label": "C",
"location": [
10.854475975036621,
10.85447597503662,
-3.118603229522705,
0.0
]
Expand All @@ -357,7 +357,7 @@
"label": "C",
"location": [
11.638409614562989,
-2.5010316371917726,
-2.501031637191773,
0.0
]
},
Expand All @@ -373,7 +373,7 @@
"label": "C",
"location": [
13.045523643493653,
-3.6193912029266359,
-3.619391202926636,
0.0
]
},
Expand All @@ -388,7 +388,7 @@
{
"label": "C",
"location": [
12.612141609191895,
12.612141609191897,
-4.526418209075928,
0.0
]
Expand Down Expand Up @@ -461,7 +461,7 @@
"label": "C",
"location": [
15.508987426757813,
-2.8249926567077638,
-2.824992656707764,
0.0
]
},
Expand Down Expand Up @@ -493,7 +493,7 @@
"label": "C",
"location": [
17.241010665893556,
-2.8249926567077638,
-2.824992656707764,
0.0
]
},
Expand Down
16 changes: 8 additions & 8 deletions api/tests/integration/tests/formats/ref/multi_overlap.ket
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@
{
"label": "C",
"location": [
11.369860649108887,
11.369860649108889,
-9.212441444396973,
0.0
]
},
{
"label": "C",
"location": [
11.369860649108887,
11.369860649108889,
-8.212483406066895,
0.0
]
Expand All @@ -120,7 +120,7 @@
"label": "C",
"location": [
10.503897666931153,
-7.7125043869018559,
-7.712504386901856,
0.0
]
},
Expand Down Expand Up @@ -191,7 +191,7 @@
{
"label": "C",
"location": [
26.057207107543947,
26.05720710754395,
-8.89754867553711,
0.0
]
Expand Down Expand Up @@ -274,7 +274,7 @@
{
"label": "C",
"location": [
17.044635772705079,
17.04463577270508,
-9.00248908996582,
0.0
]
Expand Down Expand Up @@ -325,7 +325,7 @@
{
"label": "C",
"location": [
19.534748077392579,
19.53474807739258,
-8.932470321655274,
0.0
]
Expand All @@ -341,7 +341,7 @@
{
"label": "C",
"location": [
20.035423278808595,
20.035423278808599,
-8.067529678344727,
0.0
]
Expand Down Expand Up @@ -410,7 +410,7 @@
"label": "C",
"location": [
6.014000415802002,
-9.242452621459961,
-9.24245262145996,
0.0
]
},
Expand Down
Loading

0 comments on commit 5eb60ce

Please sign in to comment.