v1.52

Author: asjadnaqvi

CITATION.cff

@@ -3,6 +3,6 @@ authors:
 - family-names: "Naqvi"
   given-names: "Asjad"
 title: "Stata package ``graphfunctions''"
-version: 1.5
-date-released: 2024-11-05
+version: 1.52
+date-released: 2025-02-18
 url: "https://github.com/asjadnaqvi/stata-graphfunctions"

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Asjad Naqvi
+Copyright (c) 2025 Asjad Naqvi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -7,8 +7,8 @@
 
 
 
-# graphfunctions v1.51
-*(28 Nov 2024)*
+# graphfunctions v1.52
+*(18 Feb 2025)*
 
 A suite of graph functions for Stata. The program is designed to be called by other programs, but it can be used as a standalone as well. The page will provide some minimum examples, but for the full scope, see the relevant help files.
 
@@ -18,7 +18,7 @@ Currently, this package contains:
 |Program|Version|Updated|Description|
 |----| ---- | ---- | ----- |
 | [labsplit](#labsplit) | 1.1 | 08 Oct 2024 | Text wrapping |
-| [catspline](#catspline) | 1.1 | 28 Nov 2024 | Catmull-Rom splines |
+| [catspline](#catspline) | 1.2 | 18 Feb 2024 | Catmull-Rom splines |
 | [arc](#arc) | 1.2 | 20 Nov 2024 | Draw arcs between two points |
 | [shapes](#shapes) | 1.3 | 05 Nov 2024 | Contains `shapes circle`, `shapes pie`, `shapes square`, `shapes rotate`, `shapes area` |
 
@@ -35,7 +35,7 @@ SSC (**v1.51**):
 ssc install graphfunctions, replace
 ```
 
-GitHub (**v1.51**):
+GitHub (**v1.52**):
 
 ```stata
 net install graphfunctions, from("https://raw.githubusercontent.com/asjadnaqvi/stata-graphfunctions/main/installation/") replace
@@ -104,7 +104,7 @@ twoway (scatter y x, mlabel(newlab3) mlabsize(3)), title("Word wrap")
 <img src="/figures/labsplit2.png" width="50%"><img src="/figures/labsplit3.png" width="50%">
 
 ### catspline
-*(v1.0: 04 Oct 2024)*
+*(v1.2: 18 Feb 2025)*
 
 
 The program allows users to generate splines based on the [Catmull-Rom algorithm](https://en.wikipedia.org/wiki/Centripetal_Catmull%E2%80%93Rom_spline).
@@ -550,6 +550,11 @@ Please open an [issue](https://github.com/asjadnaqvi/stata-graphfunctions/issues
 
 ## Change log
 
+**v1.52 (18 Feb 2025)**
+- `catspline` now generate the stated number of points.
+- `catspline` now respects `if/in` conditions.
+- Minor corrections and bug fixes.
+
 **v1.51 (28 Nov 2024)**
 - Fixed `catspline` to correct generate splines. Added options to replace variables. Change in routine to make it more efficient in computations.
 - Added `replace`, `append` to `arc`. Various bug fixes.

installation/catspline.ado

@@ -1,28 +1,25 @@
-*! catspline v1.1 (28 Nov 2024)
+*! catspline v1.2 (18 Feb 2025): Fixed marksample bug.
 *! Asjad Naqvi (asjadnaqvi@gmail.com)
 
+* v1.2 (18 Feb 2025): Fixed marksample bug.
 * v1.1 (28 Nov 2024): Fix an issue with observations stacking. Fixed a minor bug in sort. Added a sort(), replace variable.
 * v1.0 (04 Oct 2024): first release.
 
 
 /*
-to do: add option "replace", add option `sort()'.
-
+to do: add option `sort()'.
 
 */
 
 
 cap program drop catspline
 
-program catspline, // sortpreserve
+program catspline, sortpreserve
 
 version 11
 
 	syntax varlist(numeric min=2 max=2) [if] [in], [ rho(numlist max=1 >=0 <=1) n(real 40) close noid genx(string) geny(string) genid(string) genorder(string) sort(varlist max=1) replace ] 
 
-	tokenize `varlist'
-	local vary `1'
-	local varx `2'
 
 	// prepare the variables
 	local xvar _x
@@ -46,27 +43,36 @@ version 11
 
 	cap confirm var _id
 	if !_rc {
-			display as error "Variable {it:_id} already exists."
+			display as error "Variable {it:_id} already exists. Option {it:replace} can be used to overwrite."
 			exit
 	} 	
 
+	
+	marksample touse, strok
+	
 quietly {
 preserve	
 
+	keep if `touse'
+	
+	keep `varlist' `sort'	
+	
+	tokenize `varlist'
+	local vary `1'
+	local varx `2'
 
-		
 
-	keep `varlist' `sort'
+	
 	drop if missing(`varx')
 	drop if missing(`vary')
-	
+
+
 	if "`sort'" != "" sort `sort'
 
 	gen pts = _n
 	order pts
 
 
- 
 	if "`rho'" == "" local rho 0.5
 
     if `n' < 5 {
@@ -77,8 +83,13 @@ preserve
 
 	if _N < `n' set obs `n'
 
+	
+	
 	gen id = _n - 1
 
+ 
+	
+ 
 	levelsof pts, local(points)
 	local last = r(r)
 
@@ -114,7 +125,10 @@ preserve
 		gen double `t3' = (((`x3' - `x2')^2 + (`y3' - `y2')^2)^`rho') + `t2'	
 
 		local diff = abs(`t2' - `t1') / (`n' - 1)
-		gen double t`x' = `t1' + (`diff' * id)
+		
+		*local diff = abs(`n') / (`n' - 1)
+		
+		gen double t`x' = `t1' + (`diff' * id) in 1/`n'
 
 
 		**** calculate the As	
@@ -146,23 +160,35 @@ preserve
 
 	}	
 
-
+	
 	cap drop `varlist' pts id
 
-	local obs2 = `n'+ 1
-	if _N < `obs2' set obs `obs2'	 // add an empty row
+	drop if t1==.
+	
+	
+	
+	set obs `= `n'+ 1'	 // add an empty row
 
 
 	gen `ordervar' = _n
+	
+	
+	
+	
 	reshape long `xvar' `yvar' t, i(`ordervar') j(`idvar')
 
- 
-	if "`close'" == "" drop if `idvar'==`last' - 1
- 
-	drop t
 	order `idvar' `ordervar'
 	sort `idvar' `ordervar'
 
+	
+	if "`close'" == "" {
+		summ `idvar'
+		drop if `idvar'==r(max)
+	}
+ 
+	drop t
+
+	
 	tempfile mysplines
 	save `mysplines', replace
 
@@ -183,7 +209,7 @@ restore
 	merge m:1 `idvar' `ordervar' using `mysplines'	
 	drop _merge
 
-
+*/
 
 }	
 

installation/catspline.sthlp

@@ -1,5 +1,5 @@
 {smcl}
-{* 28Nov2024}{...}
+{* 18Feb2025}{...}
 {hi:help catspline}{...}
 {right:{browse "https://github.com/asjadnaqvi/stata-graphfunctions":graphfunctions (GitHub)}}
 
@@ -63,8 +63,8 @@ More examples on {browse "https://github.com/asjadnaqvi/stata-graphfunctions":Gi
 
 {title:Package details}
 
-Version      : {bf:catspline} v1.1 in {stata help graphfunctions:graphfunctions}
-This release : 28 Nov 2024
+Version      : {bf:catspline} v1.2 in {stata help graphfunctions:graphfunctions}
+This release : 18 Feb 2025
 First release: 04 Oct 2024
 Repository   : {browse "https://github.com/asjadnaqvi/stata-graphfunctions":GitHub}
 Keywords     : Stata, graph, splines, catmull rom function

installation/graphfunctions.pkg

@@ -1,4 +1,4 @@
-v 1.51
+v 1.52
 d {bf:GRAPHFUNCTIONS}: A collection of functions to extend graph functionality in Stata
 d
 d Requires: Stata version 11 or higher.
@@ -10,7 +10,7 @@ d KW: text wrap
 d KW: splines
 d KW: shapes
 d
-d Distribution-Date: 20241128
+d Distribution-Date: 20250218
 d License: MIT
 d
 d Author: Asjad Naqvi (asjadnaqvi@gmail.com)

installation/graphfunctions.sthlp

@@ -1,7 +1,7 @@
 {smcl}
-{* 28Nov2024}{...}
+{* 18Feb2025}{...}
 {hi:help graphfunctions}{...}
-{right:{browse "https://github.com/asjadnaqvi/stata-graphfunctions":graphfunctions v1.51 (GitHub)}}
+{right:{browse "https://github.com/asjadnaqvi/stata-graphfunctions":graphfunctions v1.52 (GitHub)}}
 
 
 {title:GRAPH FUNCTIONS}: 
@@ -12,7 +12,7 @@ This package contains the following program(s):
 {hline}
 
 {stata help labsplit:labsplit}  v1.1 (08 Oct 2024)  Various options for wrapping labels.
-{stata help catspline:catspline} v1.1 (28 Nov 2024)  Generate Catmull-Rom splines.
+{stata help catspline:catspline} v1.2 (18 Feb 2025)  Generate Catmull-Rom splines.
 {stata help arc:arc}       v1.2 (20 Nov 2024)  Draw an arc between two points.
 {stata help shapes:shapes}    v1.3 (05 Nov 2024)  Draw shapes. Contains several sub programs.
 
@@ -31,23 +31,14 @@ Please submit bugs, errors, feature requests on {browse "https://github.com/asja
 
 {title:Citation guidelines}
 
-Suggested citation guidlines for this package:
-
-Naqvi, A. (2024). Stata package "graphfunctions" version 1.51. Release date 28 November 2024. https://github.com/asjadnaqvi/stata-graphfunctions.
-
-@software{graphfunctions,
-   author = {Naqvi, Asjad},
-   title = {Stata package ``graphfunctions''},
-   url = {https://github.com/asjadnaqvi/stata-graphfunctions},
-   version = {1.51},
-   date = {2024-11-28}
-}
+See {browse "https://ideas.repec.org/c/boc/bocode/s459379.html"} for the official SSC citation. 
+Please note that the GitHub version might be newer than the SSC version.
 
 
 {title:Package details}
 
-Version      : {bf:graphfunctions} v1.51
-This release : 28 Nov 2024
+Version      : {bf:graphfunctions} v1.52
+This release : 18 Feb 2025
 First release: 28 Sep 2024
 Repository   : {browse "https://github.com/asjadnaqvi/stata-graphfunctions":GitHub}
 License      : {browse "https://opensource.org/licenses/MIT":MIT}
@@ -57,10 +48,9 @@ E-mail       : asjadnaqvi@gmail.com
 Twitter/X    : {browse "https://x.com/AsjadNaqvi":@AsjadNaqvi}
 
 
-{title:Other packages}
-
+{title:Other visualization packages}
 {psee}
-    {helpb arcplot}, {helpb alluvial}, {helpb bimap}, {helpb bumparea}, {helpb bumpline}, {helpb circlebar}, {helpb circlepack}, {helpb clipgeo}, {helpb delaunay}, {helpb graphfunctions}, {helpb joyplot}, 
-	{helpb marimekko}, {helpb polarspike}, {helpb sankey}, {helpb schemepack}, {helpb spider}, {helpb splinefit}, {helpb streamplot}, {helpb sunburst}, {helpb ternary}, {helpb treecluster}, {helpb treemap}, {helpb trimap}, {helpb waffle}
+    {helpb arcplot}, {helpb alluvial}, {helpb bimap}, {helpb bumparea}, {helpb bumpline}, {helpb circlebar}, {helpb circlepack}, {helpb clipgeo}, {helpb delaunay}, {helpb graphfunctions}, {helpb geoboundary}, {helpb geoflow}, {helpb joyplot}, 
+	{helpb marimekko}, {helpb polarspike}, {helpb sankey}, {helpb schemepack}, {helpb spider}, {helpb splinefit}, {helpb streamplot}, {helpb sunburst}, {helpb ternary}, {helpb tidytuesday}, {helpb treecluster}, {helpb treemap}, {helpb trimap}, {helpb waffle}
 
-or visit {browse "https://github.com/asjadnaqvi":GitHub}.
+Visit {browse "https://github.com/asjadnaqvi":GitHub} for further information.