From a0d001276ae3d00e0bfcc6cb1c92e325838d3b03 Mon Sep 17 00:00:00 2001 From: Ikechukwu Eze Date: Sat, 22 Feb 2020 11:56:52 +0100 Subject: [PATCH 1/5] feat: Implement header --- src/LasCs.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LasCs.cs b/src/LasCs.cs index 98a317b..d6c9ea8 100644 --- a/src/LasCs.cs +++ b/src/LasCs.cs @@ -155,10 +155,10 @@ public string[] header() var uncommentSth = removeComment(sth).Trim(); if(uncommentSth.Length < 0) { - //throw las error + //TODO: Throw Error instead of printing to the console Console.WriteLine("There is no header in the file"); } - return uncommentSth.Split("\n").Select(m => m.Trim().Split(@"\s+|[.]")[0]).ToArray(); + return uncommentSth.Split("\n").Select(m => Regex.Split(m.Trim(), @"\s+|[.]")[0]).ToArray(); } public static string removeComment(string str) From 9abf5b318734d0da0b7b051fb0815a4677d8683b Mon Sep 17 00:00:00 2001 From: Ikechukwu Eze Date: Sat, 22 Feb 2020 12:19:10 +0100 Subject: [PATCH 2/5] fix: metadata - Add version - refactor wrap --- src/LasCs.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/LasCs.cs b/src/LasCs.cs index d6c9ea8..2a009d5 100644 --- a/src/LasCs.cs +++ b/src/LasCs.cs @@ -122,16 +122,14 @@ public string other() public (double, bool) metadata() { - var str = this.blobString; - var sB = (string)str.Trim().Split(@"~V(?:\w*\s*)*\n\s*")[1].Split("~")[0]; + var sB = Regex.Split(this.blobString, @"~V(?:\w*\s*)*\n\s*")[1].Split("~")[0]; var sw = removeComment(sB); - var refined = sw.Split("\n").Select(m => m.Split(@"\s{2,}|\s*:").ToList() + var refined = sw.Split("\n").Select(m => Regex.Split(m, @"\s{2,}|\s*:").ToList() .GetRange(0, 2)) - .Where(f => f != null); + .Where(f => f != null).ToList(); var res = refined.Select(r => r[1]); var wrap = res.ToList()[1].ToLower() == "yes" ? true : false; - object[] arr = new object[2] {double.Parse(res.ToList()[0]), wrap}; if(arr.Length < 0) @@ -144,8 +142,12 @@ public string other() public bool wrap() { - var v = this.metadata(); - return v.Item2; + retrun this.metadata().Item2; + } + + public double version() + { + retrun this.metadata().Item1; } public string[] header() From 95feaf439e26a9d41441e148c8158da1ee2e0b65 Mon Sep 17 00:00:00 2001 From: Ikechukwu Eze Date: Sat, 22 Feb 2020 12:21:45 +0100 Subject: [PATCH 3/5] remove unneccessary `ToList` --- src/LasCs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LasCs.cs b/src/LasCs.cs index 2a009d5..6a05479 100644 --- a/src/LasCs.cs +++ b/src/LasCs.cs @@ -126,7 +126,7 @@ public string other() var sw = removeComment(sB); var refined = sw.Split("\n").Select(m => Regex.Split(m, @"\s{2,}|\s*:").ToList() .GetRange(0, 2)) - .Where(f => f != null).ToList(); + .Where(f => f != null); var res = refined.Select(r => r[1]); var wrap = res.ToList()[1].ToLower() == "yes" ? true : false; From 8c7f8659969d549d98cc0c7d7a772757665a3e9b Mon Sep 17 00:00:00 2001 From: Ikechukwu Eze Date: Sat, 22 Feb 2020 12:29:30 +0100 Subject: [PATCH 4/5] fix: other --- src/LasCs.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/LasCs.cs b/src/LasCs.cs index 6a05479..9d26c96 100644 --- a/src/LasCs.cs +++ b/src/LasCs.cs @@ -104,20 +104,14 @@ public string[] data() public string other() { - var s = this.blobString; - var som = Regex.Split((string)s, @"~O(?:\w*\s*)*\n\s*i")[1]; - var str = " "; - if (som != null) + var som = Regex.Split(this.blobString, @"~O(?:\w*\s*)*\n\s*i"); + if (som.Length > 1) { var some = - som.Split("~")[0].Replace(@"/\n\s*/g", " ").Trim(); - str = removeComment(some); - } - if (str.Length <= 0) - { - return " "; + som[1].Split("~")[0].Replace(@"/\n\s*/g", " ").Trim(); + return removeComment(some); } - return str; + return ""; } public (double, bool) metadata() From 9274c7f57dc9086aef98acaedc60f4ee7d44613e Mon Sep 17 00:00:00 2001 From: Ikechukwu Eze Date: Sat, 22 Feb 2020 14:02:51 +0100 Subject: [PATCH 5/5] fix: Las.data --- src/LasCs.cs | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/LasCs.cs b/src/LasCs.cs index 9d26c96..7827b4d 100644 --- a/src/LasCs.cs +++ b/src/LasCs.cs @@ -75,32 +75,19 @@ public int columnCount() } - /** - * Returns a two-dimensional array of data in the log - * @returns {(Promise>>)} - * @memberof Las - */ - public string[] data() + public string[][] data() { - var s = this.blobString; - var hds = this.header(); - var totalheadersLength = hds.Length; - - var sB = Regex.Split((string)s, @"~A(?:\w*\s*)*\n")[1] - .Trim() - .Split(@"\s+") - .Select(m => convertToValue(m.Trim())); - - if(sB.Count() < 0) + var sB = Regex.Split(this.blobString, @"~A(?:\w*\s*)*\n")[1] + .Trim(); + var sBs = Regex.Split(sB, @"\s+") + .Select(m => m.Trim()).ToArray(); + if(sBs.Length < 0) { Console.WriteLine("No data/~A section in the file"); } - - - string[] arr = new string[2] { "g", "f" }; - return arr; - + return chunk(sBs, this.header().Length); } + public string other() {