Skip to content

Commit

Permalink
Merge pull request #14 from AliMatias/combine-mode
Browse files Browse the repository at this point in the history
Combine mode
  • Loading branch information
AliMatias authored Jun 29, 2019
2 parents e4d4f49 + 326bb6e commit 46be969
Show file tree
Hide file tree
Showing 15 changed files with 31,057 additions and 53 deletions.
26 changes: 26 additions & 0 deletions DB Scripts/DDL_create_tables_moleculas.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

CREATE TABLE "moleculas_lista"(
"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
"formula" TEXT NULL,
"formula_nomenclatura_sistematica" TEXT NULL,
"nomenclatura_stock" TEXT NULL,
"nomenclatura_tradicional" TEXT NULL);


CREATE TABLE "moleculas_mapping_element"(
"id_molecula" INTEGER,
"id_elemento" INTEGER,
"cantidad" INTEGER,

PRIMARY KEY (id_molecula, id_elemento, cantidad),

CONSTRAINT fk_moleculas
FOREIGN KEY (id_molecula)
REFERENCES moleculas_lista(id),

CONSTRAINT fk_elementos
FOREIGN KEY (id_elemento)
REFERENCES valida_elementos(id));



20 changes: 20 additions & 0 deletions DB Scripts/INSERT_moleculas.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
INSERT INTO "moleculas_lista" VALUES (1,'H2O','monóxido de dihidrógeno','óxido de hidrógeno','Agua');
INSERT INTO "moleculas_lista" VALUES (2,'CO','Monóxido de carbono','Óxido de carbono (II)','Oxido de Carbono');
INSERT INTO "moleculas_lista" VALUES (3,'K2O','Monóxido de dipotasio','Óxido de potasio','óxido potásico');
INSERT INTO "moleculas_lista" VALUES (4,'Cu2O','Monóxido de dicobre','Óxido de cobre (I)','Óxido cuproso');
INSERT INTO "moleculas_lista" VALUES (5,'Fe2O3','Trióxido de dihierro','Óxido de hierro (III)','Óxido ferrico');
INSERT INTO "moleculas_lista" VALUES (6,'FeO','Monoxido de hierro','Óxido de hierro (II)','Oxido ferroso');
INSERT INTO "moleculas_lista" VALUES (7,'SiO2','Dióxido de silicio','Óxido de silicio (IV)','Oxido de Silicio');
INSERT INTO "moleculas_lista" VALUES (8,'KH','monohidruro de potasi','Hidruro de potasio','hidruro potásico');
INSERT INTO "moleculas_lista" VALUES (9,'NiH3','Trihidruro de níquel','Hidruro de níquel (III)','hidruro niquélico');
INSERT INTO "moleculas_lista" VALUES (10,'CuH2','Dihidruro de cobre','Hidruro de cobre (II)','hidruro cúprico');
INSERT INTO "moleculas_lista" VALUES (11,'PbH4','Tetrahidruro de plomo','Hidruro de plomo (IV)','hidruro plúmbico');
INSERT INTO "moleculas_lista" VALUES (12,'FeS','Monosulfuro de hierro','Sulfuro de hierro (II)','sulfuro ferroso');
INSERT INTO "moleculas_lista" VALUES (13,'Fe2S3','Trisulfuro de dihierro','Sulfuro de hierro (III)','sulfuro ferrico');
INSERT INTO "moleculas_lista" VALUES (14,'AuCl3','Tricloruro de oro','Cloruro de oro (III)','cloruro áurico');
INSERT INTO "moleculas_lista" VALUES (15,'AuBr','Monobromuro de oro','Bromuro de oro (I)','bromuro auroso');
INSERT INTO "moleculas_lista" VALUES (16,'MnS2','Disulfuro de manganeso','Sulfuro de manganeso (IV)','Sulfuro de manganeso');
INSERT INTO "moleculas_lista" VALUES (17,'N2O','Monoxido de dinitrógeno','Óxido de nitrógeno (I)','Oxido Hiponitroso');
INSERT INTO "moleculas_lista" VALUES (18,'N2O3','Trióxido de dinitrógeno','Óxido de nitrógeno (III)','Oxido Nitroso');
INSERT INTO "moleculas_lista" VALUES (19,'N2O5','Pentóxido de dinitrógeno','Óxido de nitrógeno (V)','Oxido Nitrico');
INSERT INTO "moleculas_lista" VALUES (20,'HIO','Monoxoyodato (I) de hidrógeno','Ácido monoxoyódico (I)','ácido hipoyodoso');
41 changes: 41 additions & 0 deletions DB Scripts/INSERT_moleculas_mapping_element.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
INSERT INTO "moleculas_mapping_element" VALUES (1,1,2);
INSERT INTO "moleculas_mapping_element" VALUES (1,8,1);
INSERT INTO "moleculas_mapping_element" VALUES (2,6,1);
INSERT INTO "moleculas_mapping_element" VALUES (2,8,1);
INSERT INTO "moleculas_mapping_element" VALUES (3,19,2);
INSERT INTO "moleculas_mapping_element" VALUES (3,1,1);
INSERT INTO "moleculas_mapping_element" VALUES (4,29,2);
INSERT INTO "moleculas_mapping_element" VALUES (4,8,1);
INSERT INTO "moleculas_mapping_element" VALUES (5,26,2);
INSERT INTO "moleculas_mapping_element" VALUES (5,8,3);
INSERT INTO "moleculas_mapping_element" VALUES (6,26,1);
INSERT INTO "moleculas_mapping_element" VALUES (6,8,1);
INSERT INTO "moleculas_mapping_element" VALUES (7,14,1);
INSERT INTO "moleculas_mapping_element" VALUES (7,8,2);
INSERT INTO "moleculas_mapping_element" VALUES (8,19,1);
INSERT INTO "moleculas_mapping_element" VALUES (8,1,1);
INSERT INTO "moleculas_mapping_element" VALUES (9,28,1);
INSERT INTO "moleculas_mapping_element" VALUES (9,1,3);
INSERT INTO "moleculas_mapping_element" VALUES (10,29,1);
INSERT INTO "moleculas_mapping_element" VALUES (10,1,2);
INSERT INTO "moleculas_mapping_element" VALUES (11,82,1);
INSERT INTO "moleculas_mapping_element" VALUES (11,1,4);
INSERT INTO "moleculas_mapping_element" VALUES (12,26,1);
INSERT INTO "moleculas_mapping_element" VALUES (12,16,1);
INSERT INTO "moleculas_mapping_element" VALUES (13,26,2);
INSERT INTO "moleculas_mapping_element" VALUES (13,16,3);
INSERT INTO "moleculas_mapping_element" VALUES (14,79,1);
INSERT INTO "moleculas_mapping_element" VALUES (14,17,3);
INSERT INTO "moleculas_mapping_element" VALUES (15,79,1);
INSERT INTO "moleculas_mapping_element" VALUES (15,35,1);
INSERT INTO "moleculas_mapping_element" VALUES (16,25,1);
INSERT INTO "moleculas_mapping_element" VALUES (16,16,2);
INSERT INTO "moleculas_mapping_element" VALUES (17,7,2);
INSERT INTO "moleculas_mapping_element" VALUES (17,8,3);
INSERT INTO "moleculas_mapping_element" VALUES (18,7,2);
INSERT INTO "moleculas_mapping_element" VALUES (18,8,1);
INSERT INTO "moleculas_mapping_element" VALUES (19,7,2);
INSERT INTO "moleculas_mapping_element" VALUES (19,8,5);
INSERT INTO "moleculas_mapping_element" VALUES (20,1,1);
INSERT INTO "moleculas_mapping_element" VALUES (20,53,1);
INSERT INTO "moleculas_mapping_element" VALUES (20,8,1);
2 changes: 1 addition & 1 deletion New Unity Project/Assets/Prefabs/Atom.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 1.5
m_Radius: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &5101313304361824544
GameObject:
Expand Down
Binary file modified New Unity Project/Assets/SIAMM.db
Binary file not shown.
Loading

0 comments on commit 46be969

Please sign in to comment.