Fix issues + add read_mat()

Author: VEZY

Diff for: NAMESPACE

@@ -9,3 +9,4 @@ export(Remplir)
 export(Rota_Inverse_YZ)
 export(Rota_YZ)
 export(XYZ_Vers_Agl)
+export(read_mat)

Diff for: R/CreaPoints.R

@@ -113,15 +113,10 @@ CreaPoints = function(MOE, CIS, matExp){
   DAppliPoidsFeuil = sin(XDistance / tail(XDistance,1) * pi) * dF
 
   #===============================================================================
-  # Resultat
-  matrix(c(X,Y,Z,TypeSection,Base,Hauteur,
-           PoidsTige,PoidsFeuillesDroite,PoidsFeuillesGauche,
-           ModuleElasticite,ModuleCisaillement,AngleSection,
-           DAppliPoidsFeuil), ncol = NpointsExp, byrow = TRUE)
-
+  # Resultats
   matrix(unlist(c(X,Y,Z,TypeSection,Base,Hauteur,
                   PoidsTige,PoidsFeuillesDroite,PoidsFeuillesGauche,
                   ModuleElasticite,ModuleCisaillement,AngleSection,
                   DAppliPoidsFeuil)), ncol = NpointsExp, byrow = TRUE)
-
+  # x	y	z	type	b	h	mass	leaves_mass_right	leaves_mass_left	elastic_modulus	shear_modulus	torsion distance
 }

Diff for: R/read_mat.R

@@ -0,0 +1,26 @@
+#' Read field matrix
+#'
+#' Read the matrix from field measurements.
+#'
+#' @param path Path to the file
+#'
+#' @return A formatted [data.frame()]
+#' @export
+#'
+#' @examples
+#' filepath = system.file("extdata/6_EW01.22_17_kanan.txt", package = "deformation")
+#' matExp = read_mat(filepath)
+read_mat = function(path){
+  matExp = data.table::fread(path, data.table = FALSE)
+  if(nrow(matExp) != 12){
+    stop("File not in the right format, expected 12 columns, found ",
+         nrow(matExp), ". Did you try to read a data.frame ? In that ",
+         'case use e.g.:\n`data.table::fread("',path,'"',", data.table = FALSE)`")
+  }
+  df = data.frame(t(matExp))
+
+  colnames(df) = c("distance","type","width","heigth","inclination",
+                   "torsion","x","y","z","mass","mass_right",
+                   "mass_left")
+  df
+}

Diff for: inst/extdata/6_EW01.22_17_kanan_df.txt

@@ -0,0 +1,6 @@
+distance,type,width,heigth,inclination,torsion,x,y,z,mass,mass_right,mass_left
+0,1,0.0755,0.0411,48.8,4,0,0,0,0,0,0
+1.34,2,0.03291,0.0303,48.8,4,1.11,0.25,0.79,1.3036,0.1339,0.1654
+1.34,3,0.0181,0.02982,48.8,4,2.196,0.275,1.07,0.6466,0.4388,0.4828
+0.77,4,0.01144,0.01121,48.8,4,3.056,0.38,1.01,0.123,0.2568,0.2411
+0.77,5,0.001,0.001,48.8,4,3.791,0.53,0.42,0.0347,0.0962,0.102