removed some keeping data and data catalog reordering

actes-princiers/conf/base/catalog.yml

@@ -7,37 +7,39 @@ bourbon:
   folderpath: data/01_raw/xml/Bourbon
   xsltstylesheet: templates/xsl/actes_princiers.xsl
 
+# input (read only) dataset
+bourbon_json:
+  type: actesdataset.BsXMLDataSetCollection
+  housename: bourbon
+  folderpath: data/01_raw/xml/Bourbon
+
+# _________________________________________________________________________
+  
 # output (write) **pseudo xml** dataset
 bourbon_xmlcontent:
   type: actesdataset.XMLDataSetCollection
   housename: bourbon
-  folderpath: data/02_intermediate/xml/Bourbon/xml
+  folderpath: data/02_intermediate/Bourbon/pseudoxml
   xsltstylesheet: templates/xsl/actes_princiers.xsl
   
 # input (read) **pseudo xml** dataset
+# as it is **not** regular xml, an xml loader cannot be used
 bourbon_pseudoxmlcontent:
   type: actesdataset.TextDataSetCollection
   housename: bourbon
-  folderpath: data/02_intermediate/xml/Bourbon/xml
-
-# input (read only) dataset
-bourbon_json:
-  type: actesdataset.BsXMLDataSetCollection
-  housename: bourbon
-  folderpath: data/01_raw/xml/Bourbon
+  folderpath: data/02_intermediate/Bourbon/pseudoxml
 
 # input (read) and output (write) dataset
 bourbon_jsonoutput:
   type: actesdataset.JSONDataSetCollection
   housename: bourbon
-  folderpath: data/02_intermediate/xml/Bourbon/json
+  folderpath: data/02_intermediate/Bourbon/json
 
-# output (write) dataset
+# output (write) and input (read) dataset
 bourbon_fulljsonoutput:
   type: actesdataset.JSONDataSetCollection
   housename: bourbon
-  folderpath: data/02_intermediate/xml/Bourbon/fulljson
-
+  folderpath: data/02_intermediate/Bourbon/fulljson
 
 
 ## ________________________________________________________________________

actes-princiers/data/02_intermediate/csv/preprocessed_actors.csv

@@ -1,50 +0,0 @@
-NAME;ROLE;HOUSE;DATE1;DATE2;DATE3
-Charles Ier de Bourbon;prince;Bourbon;1400;1434.0;1456.0
-Gort, Étienne;secret;Bourbon;1425;1440.0;
-Erart;secret;Berry;1404;1405.0;
-Jean de Berry;prince;Berry;1337;1360.0;1416.0
-Agnès de Bourgogne;prince;Bourbon;1407;1434.0;1476.0
-Marghas, Philippe;secret;Bourbon;1426;1433.0;
-Marie de Berry;prince;Bourbon;1480;1410.0;1434.0
-René d'Anjou;prince;Anjou;;;
-Arthur de Richemont;prince;Bretagne;;;
-Bernard d'Armagnac;prince;Armagnac;;;
-Philippe le Bon;prince;Bourgogne;;;
-Gourriet, Lorrin;secret;Bourbon;;;
-De Bar, Étienne;secret;Bourbon;;;
-Gon, Jean;secret;Bourbon;;;
-Trichon, Jean;secret;Bourbon;;;
-Chevalier, E.;secret;Bretagne;;;
-Cadier, Guillaume;secret;Bourbon;;;
-Decharmeres, J.;secret;Anjou;;;
-Dommessent;secret;Bourgogne;Bretagne;;
-Andraut, Laurent;secret;Bourbon;;;
-Breneal, Jean;secret;Bourgogne;;;
-De Castillione;secret;Anjou;;;
-Yollande d'Aragon;prince;Anjou;;;
-Marie de Blois;prince;Anjou;;;
-Grauquellin;secret;Anjou;;;
-Michael;secret;Anjou;;;
-Matheus;secret;Anjou;;;
-Louis Ier d'Anjou;prince;Anjou;;;
-Louis II d'Anjou;prince;Anjou;;;
-Louis III d'Anjou;prince;Anjou;;;
-Caillot, G.;secret;Anjou;;;
-Olivier;secret;Anjou;;;
-Benepy;secret;Anjou;;;
-Gontier, Col;secret;Berry;;;
-Franchome;secret;Anjou;;;
-Isabelle de Lorraine;prince;Anjou;;;
-Bollumbrellus;secret;Anjou;;;
-Nicolao Perigaut;secret;Anjou;;;
-De Vaulx;secret;Anjou;;;
-Alardeau, Jean;secret;Anjou;;;
-Charnières;secret;Anjou;;;
-Nicolas;secret;Anjou;;;
-Rouxelet;secret;Anjou;;;
-Boursier;secret;Anjou;;;
-Petre;secret;Anjou;;;
-Ponce Caihe;secret;Anjou;;;
-J. Crete;secret;Anjou;;;
-J. de Vernon;secret;Anjou;;;
-Tourneville, Guillaume;secret;Anjou;;;

actes-princiers/data/02_intermediate/csv/preprocessed_test_dataset.csv

@@ -1,50 +0,0 @@
-,"NAME;""ROLE"";""HOUSE"";""DATE1"";""DATE2"";""DATE3"""
-0,"Charles Ier de Bourbon;""prince"";""Bourbon"";""1400"";""1434"";""1456"""
-1,"Gort, Étienne;""secret"";""Bourbon"";""1425"";""1440"";"
-2,"Erart;""secret"";""Berry"";""1404"";""1405"";"
-3,"Jean de Berry;""prince"";""Berry"";""1337"";""1360"";""1416"""
-4,"Agnès de Bourgogne;""prince"";""Bourbon"";""1407"";""1434"";""1476"""
-5,"Marghas, Philippe;""secret"";""Bourbon"";""1426"";""1433"";"
-6,"Marie de Berry;""prince"";""Bourbon"";""1480"";""1410"";""1434"""
-7,"René d'Anjou;""prince"";""Anjou"";"""";"""";"""""
-8,"Arthur de Richemont;""prince"";""Bretagne"";"""";"""";"""""
-9,"Bernard d'Armagnac;""prince"";""Armagnac"";"""";"""";"""""
-10,"Philippe le Bon;""prince"";""Bourgogne"";"""";"""";"""""
-11,"Gourriet, Lorrin;""secret"";""Bourbon"";"""";"""";"""""
-12,"De Bar, Étienne;""secret"";""Bourbon"";"""";"""";"""""
-13,"Gon, Jean;""secret"";""Bourbon"";"""";"""";"""""
-14,"Trichon, Jean;""secret"";""Bourbon"";"""";"""";"""""
-15,"Chevalier, E.;""secret"";""Bretagne"";"""";"""";"""""
-16,"Cadier, Guillaume;""secret"";""Bourbon"";"""";"""";"""""
-17,"Decharmeres, J.;""secret"";""Anjou"";"""";"""";"""""
-18,"Dommessent;""secret"";""Bourgogne"";""Bretagne"";"""";"""""
-19,"Andraut, Laurent;""secret"";""Bourbon"";"""";"""";"""""
-20,"Breneal, Jean;""secret"";""Bourgogne"";"""";"""";"""""
-21,"De Castillione;""secret"";""Anjou"";"""";"""";"""""
-22,"Yollande d'Aragon;""prince"";""Anjou"";"""";"""";"""""
-23,"Marie de Blois;""prince"";""Anjou"";"""";"""";"""""
-24,"Grauquellin;""secret"";""Anjou"";"""";"""";"""""
-25,"Michael;""secret"";""Anjou"";"""";"""";"""""
-26,"Matheus;""secret"";""Anjou"";"""";"""";"""""
-27,"Louis Ier d'Anjou;""prince"";""Anjou"";"""";"""";"""""
-28,"Louis II d'Anjou;""prince"";""Anjou"";"""";"""";"""""
-29,"Louis III d'Anjou;""prince"";""Anjou"";"""";"""";"""""
-30,"Caillot, G.;""secret"";""Anjou"";"""";"""";"""""
-31,"Olivier;""secret"";""Anjou"";"""";"""";"""""
-32,"Benepy;""secret"";""Anjou"";"""";"""";"""""
-33,"Gontier, Col;""secret"";""Berry"";"""";"""";"""""
-34,"Franchome;""secret"";""Anjou"";"""";"""";"""""
-35,"Isabelle de Lorraine;""prince"";""Anjou"";"""";"""";"""""
-36,"Bollumbrellus;""secret"";""Anjou"";"""";"""";"""""
-37,"Nicolao Perigaut;""secret"";""Anjou"";"""";"""";"""""
-38,"De Vaulx;""secret"";""Anjou"";"""";"""";"""""
-39,"Alardeau, Jean;""secret"";""Anjou"";"""";"""";"""""
-40,"Charnières;""secret"";""Anjou"";"""";"""";"""""
-41,"Nicolas;""secret"";""Anjou"";"""";"""";"""""
-42,"Rouxelet;""secret"";""Anjou"";"""";"""";"""""
-43,"Boursier;""secret"";""Anjou"";"""";"""";"""""
-44,"Petre;""secret"";""Anjou"";"""";"""";"""""
-45,"Ponce Caihe;""secret"";""Anjou"";"""";"""";"""""
-46,"J. Crete;""secret"";""Anjou"";"""";"""";"""""
-47,"J. de Vernon;""secret"";""Anjou"";"""";"""";"""""
-48,"Tourneville, Guillaume;""secret"";""Anjou"";"""";"""";"""""