Commit 47b153d2 authored by Phuong Khanh Tran's avatar Phuong Khanh Tran
Browse files

Merge branch 'master' into '7-graphical-user-interface' 

# Conflicts:
#   src/GUI.java
#   src/Main.java
parents 72d14958 0dad6bf0

SubgraphTestcases/subgraph1.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
subgraph1

2

H

C

0 1
 
 No newline at end of file

SubgraphTestcases/subgraph2.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
subgraph2

3

H

H

O

0 2

1 2
 
 No newline at end of file

SubgraphTestcases/subgraph3.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
subgraph3

4

O

N

C

N

0 2

0 2

1 2

3 2
 
 No newline at end of file

SubgraphTestcases/subgraph4.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
subgraph4

6

O

C

N

N

C

C

0 1

0 1

1 2

1 3

2 4

3 5

4 5
 
 No newline at end of file

TestSame1.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
TestMolecule1

27

C

C

C

C

C

C

C

C

C

C

C

C

C

C

C

C

C

C

H

H

H

H

H

H

O

O

H

0 1

1 2

2 18

2 3

2 3

3 19

3 4

4 5

5 20

5 6

5 6

6 21

6 7

7 8

8 22

8 9

8 9

9 23

9 10

10 11

11 12

12 13

13 14

14 15

15 16

16 17

17 24

17 25

17 25

24 26
 
 No newline at end of file