fix of the code megre comnflicts

rsharp-lang · Feb 11, 2025 · 8dc388c · 8dc388c
2 parents 5545fae + 1b702c4
commit 8dc388c
Show file tree

Hide file tree

Showing 43 changed files with 745 additions and 641 deletions.
diff --git a/Library/Rlapack/RMatrix.vb b/Library/Rlapack/RMatrix.vb
@@ -1,4 +1,4 @@
-#Region "Microsoft.VisualBasic::209c7c62253b9de930a529c7a197ac93, Library\Rlapack\RMatrix.vb"
+#Region "Microsoft.VisualBasic::b5a5e5f1655ef95c3ff9578c1537ec22, Library\Rlapack\RMatrix.vb"
 
     ' Author:
     ' 
@@ -34,23 +34,24 @@
 
     ' Code Statistics:
 
-    '   Total Lines: 697
-    '    Code Lines: 401 (57.53%)
-    ' Comment Lines: 206 (29.56%)
-    '    - Xml Docs: 87.86%
+    '   Total Lines: 759
+    '    Code Lines: 439 (57.84%)
+    ' Comment Lines: 220 (28.99%)
+    '    - Xml Docs: 87.73%
     ' 
-    '   Blank Lines: 90 (12.91%)
-    '     File Size: 26.89 KB
+    '   Blank Lines: 100 (13.18%)
+    '     File Size: 29.21 KB
 
 
     ' Module RMatrix
     ' 
     '     Constructor: (+1 Overloads) Sub New
     ' 
     '     Function: (+3 Overloads) add, asInteger, asMatrix, createTable, (+3 Overloads) division
-    '               dot, eigen, fromGraph, gauss_solve, Matrix
-    '               matrix_extractor, (+5 Overloads) multiply, nmf_decompose, nmf_matrix, readMatrix
-    '               rowPack, saveMatrix, (+3 Overloads) substract, sum_all
+    '               dot, eigen, fromGraph, gauss, gauss_solve
+    '               Matrix, matrix_extractor, (+5 Overloads) multiply, nmf_decompose, nmf_matrix
+    '               one, parse, readMatrix, rowPack, saveMatrix
+    '               (+3 Overloads) substract, sum_all, zero
     ' 
     '     Sub: extractVector
     ' 

diff --git a/Library/Rlapack/math.vb b/Library/Rlapack/math.vb
@@ -1,4 +1,4 @@
-#Region "Microsoft.VisualBasic::cefcb128809f4d9ca452a8676fe5b277, Library\Rlapack\math.vb"
+#Region "Microsoft.VisualBasic::2aaccec18dc8df72907c635af4797fb8, Library\Rlapack\math.vb"
 
     ' Author:
     ' 
@@ -34,13 +34,13 @@
 
     ' Code Statistics:
 
-    '   Total Lines: 1035
-    '    Code Lines: 656 (63.38%)
-    ' Comment Lines: 257 (24.83%)
-    '    - Xml Docs: 89.49%
+    '   Total Lines: 1154
+    '    Code Lines: 715 (61.96%)
+    ' Comment Lines: 303 (26.26%)
+    '    - Xml Docs: 87.46%
     ' 
-    '   Blank Lines: 122 (11.79%)
-    '     File Size: 42.15 KB
+    '   Blank Lines: 136 (11.79%)
+    '     File Size: 47.86 KB
 
 
     ' Module math
@@ -49,8 +49,8 @@
     '     Function: asFormula, asLmcall, binomial, bootstrap, create_deSolve_DataFrame
     '               curve_fit, DiffEntropy, getBinTable, getMax, getMin
     '               Gini, glm, Hist, lm, loess
-    '               predict, RamerDouglasPeucker, (+2 Overloads) RK4, sim, ssm
-    '               summaryFit
+    '               predict, RamerDouglasPeucker, (+2 Overloads) RK4, scale_x, sim
+    '               ssm, summaryFit
     ' 
     ' /********************************************************************************/
 

diff --git a/Library/Rlapack/stats.vb b/Library/Rlapack/stats.vb
@@ -1,4 +1,4 @@
-#Region "Microsoft.VisualBasic::da1e630a0b8f6bb2899c10af7300597b, Library\Rlapack\stats.vb"
+#Region "Microsoft.VisualBasic::4f50b71e82a71248d58c671977b39b25, Library\Rlapack\stats.vb"
 
 ' Author:
 ' 
@@ -76,6 +76,49 @@
 ' 
 ' 
 ' /********************************************************************************/
+    '   Total Lines: 1888
+    '    Code Lines: 1059 (56.09%)
+    ' Comment Lines: 620 (32.84%)
+    '    - Xml Docs: 91.45%
+    ' 
+    '   Blank Lines: 209 (11.07%)
+    '     File Size: 80.47 KB
+
+
+    ' Module stats
+    ' 
+    '     Constructor: (+1 Overloads) Sub New
+    '     Function: matrixDataFrame, matrixDataFrame2, printMatrix, printMvar, printTtest
+    '               printTwoSampleTTest
+    '     Enum p_adjust_methods
+    ' 
+    '         BH, bonferroni, BY, fdr, hochberg
+    '         holm, hommel, none
+    ' 
+    ' 
+    ' 
+    '  
+    ' 
+    '     Function: aov, asDist, beta, chisq_test, ChiSquare
+    '               combin, corr, corr_sign, corrTest, dataframeRow
+    '               dist, dnorm, ECDF, ecdf0, filterMissing
+    '               fisher_test, gamma, gammaCDF, GetDataSetCommon, getMatrix
+    '               getQuantileLevels, iqr_outliers, lbeta, lgamma, Lowess
+    '               mantel_test, median, moran_test, mul, oplsr
+    '               p_adjust, plsda, pnorm_func, PoissonDiskGenerator_func, (+2 Overloads) pow
+    '               prcomp, pt, quantile, safeCheck, spline
+    '               tabulateMode, ttest, ttestBatch, ttestImpl, varTest
+    '               z_score, z_scoreByColumn, z_scoreByRow
+    ' 
+    ' Enum SplineAlgorithms
+    ' 
+    '     Bezier, BSpline, CatmullRom, CubiSpline
+    ' 
+    '  
+    ' 
+    ' 
+    ' 
+    ' /********************************************************************************/
 
 #End Region
 

diff --git a/Library/base/utils/xlsx.vb b/Library/base/utils/xlsx.vb
@@ -1,4 +1,4 @@
-#Region "Microsoft.VisualBasic::77bd95a232c704f7651a6713b15797f4, Library\base\utils\xlsx.vb"
+#Region "Microsoft.VisualBasic::36e1c6e9fee69d857eb8b104f256cf77, Library\base\utils\xlsx.vb"
 
     ' Author:
     ' 

diff --git a/Library/graphics/Plot2D/graphics2D.vb b/Library/graphics/Plot2D/graphics2D.vb
@@ -1,58 +1,58 @@
-#Region "Microsoft.VisualBasic::27d042a801226278189773ef10a5d07d, Library\graphics\Plot2D\graphics2D.vb"
-
-' Author:
-' 
-'       asuka (amethyst.asuka@gcmodeller.org)
-'       xie (genetics@smrucc.org)
-'       xieguigang (xie.guigang@live.com)
-' 
-' Copyright (c) 2018 GPL3 Licensed
-' 
-' 
-' GNU GENERAL PUBLIC LICENSE (GPL3)
-' 
-' 
-' This program is free software: you can redistribute it and/or modify
-' it under the terms of the GNU General Public License as published by
-' the Free Software Foundation, either version 3 of the License, or
-' (at your option) any later version.
-' 
-' This program is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU General Public License for more details.
-' 
-' You should have received a copy of the GNU General Public License
-' along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-
-' /********************************************************************************/
-
-' Summaries:
-
-
-' Code Statistics:
-
-'   Total Lines: 713
-'    Code Lines: 519 (72.79%)
-' Comment Lines: 111 (15.57%)
-'    - Xml Docs: 95.50%
-' 
-'   Blank Lines: 83 (11.64%)
-'     File Size: 29.83 KB
-
-
-' Module graphics2DTools
-' 
-'     Constructor: (+1 Overloads) Sub New
-'     Function: asciiArt, axisTicks, colorMapLegend, contourPolygon, contourTracing
-'               DrawCircle, drawLegends, DrawRectangle, DrawTriangle, layout_grid
-'               legend, line2D, measureString, offset2D, paddingString
-'               paddingVector, plotColorMap, point2D, pointsVector, rasterHeatmap
-'               (+2 Overloads) rectangle, scale, size, sizeVector
-' 
-' /********************************************************************************/
+#Region "Microsoft.VisualBasic::b22f890e7a164bac74c591822c2afff9, Library\graphics\Plot2D\graphics2D.vb"
+
+    ' Author:
+    ' 
+    '       asuka (amethyst.asuka@gcmodeller.org)
+    '       xie (genetics@smrucc.org)
+    '       xieguigang (xie.guigang@live.com)
+    ' 
+    ' Copyright (c) 2018 GPL3 Licensed
+    ' 
+    ' 
+    ' GNU GENERAL PUBLIC LICENSE (GPL3)
+    ' 
+    ' 
+    ' This program is free software: you can redistribute it and/or modify
+    ' it under the terms of the GNU General Public License as published by
+    ' the Free Software Foundation, either version 3 of the License, or
+    ' (at your option) any later version.
+    ' 
+    ' This program is distributed in the hope that it will be useful,
+    ' but WITHOUT ANY WARRANTY; without even the implied warranty of
+    ' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    ' GNU General Public License for more details.
+    ' 
+    ' You should have received a copy of the GNU General Public License
+    ' along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+    ' /********************************************************************************/
+
+    ' Summaries:
+
+
+    ' Code Statistics:
+
+    '   Total Lines: 790
+    '    Code Lines: 567 (71.77%)
+    ' Comment Lines: 128 (16.20%)
+    '    - Xml Docs: 95.31%
+    ' 
+    '   Blank Lines: 95 (12.03%)
+    '     File Size: 32.48 KB
+
+
+    ' Module graphics2DTools
+    ' 
+    '     Constructor: (+1 Overloads) Sub New
+    '     Function: asciiArt, axisTicks, colorMapLegend, contourPolygon, contourTracing
+    '               DrawCircle, drawLegends, DrawRectangle, DrawTriangle, layout_grid
+    '               legend, line2D, MeasureNumericVector, measureString, offset2D
+    '               paddingString, paddingVector, plotColorMap, point2D, pointsVector
+    '               rasterHeatmap, (+2 Overloads) rectangle, scale, size, sizeVector
+    ' 
+    ' /********************************************************************************/
 
 #End Region
 

diff --git a/Library/graphics/Plot2D/plots.vb b/Library/graphics/Plot2D/plots.vb
@@ -1,4 +1,4 @@
-#Region "Microsoft.VisualBasic::bc0c9f9219ed4b0f66ed633b561df1f7, Library\graphics\Plot2D\plots.vb"
+#Region "Microsoft.VisualBasic::d8265d208f6b104152e032f843d80493, Library\graphics\Plot2D\plots.vb"
 
     ' Author:
     ' 
@@ -34,22 +34,23 @@
 
     ' Code Statistics:
 
-    '   Total Lines: 1207
-    '    Code Lines: 940 (77.88%)
-    ' Comment Lines: 146 (12.10%)
+    '   Total Lines: 1244
+    '    Code Lines: 971 (78.05%)
+    ' Comment Lines: 146 (11.74%)
     '    - Xml Docs: 85.62%
     ' 
-    '   Blank Lines: 121 (10.02%)
-    '     File Size: 54.68 KB
+    '   Blank Lines: 127 (10.21%)
+    '     File Size: 56.41 KB
 
 
     ' Module plots
     ' 
     '     Function: barplot, ContourPlot, CreateSerial, doViolinPlot, findNumberVector
     '               measureDataTable, modelWithClass, modelWithoutClass, plot_binBox, plot_categoryBars
-    '               plot_corHeatmap, plot_deSolveResult, plot_hclust, plotArray, plotContourLayers
-    '               plotFormula, plotLinearYFit, plotLmCall, plotODEResult, plotPieChart
-    '               PlotPolygon, plotSerials, plotVector, printImage, UpSetPlot
+    '               plot_corHeatmap, plot_deSolveResult, plot_hclust, plot_heatmap, plotArray
+    '               plotContourLayers, plotFormula, plotLinearYFit, plotLmCall, plotODEResult
+    '               plotPieChart, PlotPolygon, plotSerials, plotVector, printImage
+    '               UpSetPlot
     ' 
     '     Sub: Main, TryGetClassData
     '