Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mcaceresb committed Nov 9, 2023
2 parents eddebe5 + 1b92aeb commit 22be192
Show file tree
Hide file tree
Showing 28 changed files with 5,927 additions and 6,841 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "generic-1.11.5-{build}"
version: "generic-1.11.6-{build}"

environment:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ provide a massive speed improvements to common Stata commands, including:
reshape, collapse, xtile, tabstat, isid, egen, pctile, winsor, contract,
levelsof, duplicates, unique/distinct, and more.

![Beta Version](https://img.shields.io/badge/beta-v1.11.5-blue.svg?longCache=true&style=flat-square)
![Beta Version](https://img.shields.io/badge/beta-v1.11.6-blue.svg?longCache=true&style=flat-square)
![Supported Platforms](https://img.shields.io/badge/platforms-linux--64%20%7C%20osx--64%20%7C%20win--64-blue.svg?longCache=true&style=flat-square)
[![github linux status](https://github.com/mcaceresb/stata-gtools/actions/workflows/linux.yml/badge.svg?branch=master)](https://github.com/mcaceresb/stata-gtools/actions/workflows/linux.yml)
[![github osx status](https://github.com/mcaceresb/stata-gtools/actions/workflows/osx.yml/badge.svg?branch=master)](https://github.com/mcaceresb/stata-gtools/actions/workflows/osx.yml)
Expand Down
2 changes: 1 addition & 1 deletion build/_gtools_internal.ado
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*! version 1.11.5 27Oct2023 Mauricio Caceres Bravo, [email protected]
*! version 1.11.6 08Nov2023 Mauricio Caceres Bravo, [email protected]
*! gtools function internals

* rc 17000
Expand Down
2 changes: 1 addition & 1 deletion build/gtools.ado
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*! version 1.11.5 27Oct2023 Mauricio Caceres Bravo, [email protected]
*! version 1.11.6 08Nov2023 Mauricio Caceres Bravo, [email protected]
*! Program for managing the gtools package installation

capture program drop gtools
Expand Down
4 changes: 2 additions & 2 deletions build/gtools.pkg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
v 1.11.5
v 1.11.6
d
d 'GTOOLS': Faster implementation of common Stata commands optimized for large datasets
d
Expand Down Expand Up @@ -63,7 +63,7 @@ d
d Author: Mauricio Caceres Bravo
d Support: email [email protected]
d
d Distribution-Date: 20231027
d Distribution-Date: 20231108
d
f _gtools_internal.ado
f _gtools_internal.mata
Expand Down
2 changes: 1 addition & 1 deletion build/gtools.sthlp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{smcl}
{* *! version 1.11.5 27Oct2023}{...}
{* *! version 1.11.6 08Nov2023}{...}
{viewerdialog gtools "dialog gtools"}{...}
{vieweralsosee "[R] gtools" "mansection R gtools"}{...}
{viewerjumpto "Syntax" "gtools##syntax"}{...}
Expand Down
2 changes: 1 addition & 1 deletion build/gtools_tests.do
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Created: Tue May 16 07:23:02 EDT 2017
* Updated: Mon Dec 05 09:39:49 EST 2022
* Purpose: Unit tests for gtools
* Version: 1.11.5
* Version: 1.11.6
* Manual: help gtools
* Note: You may need to run `ftools, compile` and `reghdfe, compile`
* to test gtools against ftools functions and reghdfe.
Expand Down
12,718 changes: 5,902 additions & 6,816 deletions build/gtools_tests_unix.log

Large diffs are not rendered by default.

Binary file modified build/gtools_unix_v2.plugin
Binary file not shown.
Binary file modified build/gtools_unix_v3.plugin
Binary file not shown.
Binary file modified build/gtools_windows_v2.plugin
Binary file not shown.
Binary file modified build/gtools_windows_v3.plugin
Binary file not shown.
2 changes: 1 addition & 1 deletion build/stata.toc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
v 1.11.5
v 1.11.6
d Mauricio Caceres Bravo, [email protected]
p 'GTOOLS': Faster implementation of common Stata commands for big data
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ to provide a massive speed improvements to common Stata commands,
including: reshape, collapse, xtile, tabstat, isid, egen, pctile,
winsor, contract, levelsof, duplicates, unique/distinct, and more.

![Stable Version](https://img.shields.io/badge/stable-v1.11.5%20%7C%20linux--64%20%7C%20osx--64%20%7C%20win--64-blue.svg?longCache=true&style=flat-square)
![Stable Version](https://img.shields.io/badge/stable-v1.11.6%20%7C%20linux--64%20%7C%20osx--64%20%7C%20win--64-blue.svg?longCache=true&style=flat-square)

<!--
`version 1.11.5 27Oct2023`
`version 1.11.6 08Nov2023`
Builds: Linux, OSX [![github osx status](https://github.com/mcaceresb/stata-gtools/actions/workflows/osx.yml/badge.svg?branch=master)](https://github.com/mcaceresb/stata-gtools/actions/workflows/osx.yml),
Windows (Cygwin) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/2bh1q9bulx3pl81p/branch/master?svg=true)](https://ci.appveyor.com/project/mcaceresb/stata-gtools)
-->
Expand Down
2 changes: 1 addition & 1 deletion docs/stata/gtools.sthlp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{smcl}
{* *! version 1.11.5 27Oct2023}{...}
{* *! version 1.11.6 08Nov2023}{...}
{viewerdialog gtools "dialog gtools"}{...}
{vieweralsosee "[R] gtools" "mansection R gtools"}{...}
{viewerjumpto "Syntax" "gtools##syntax"}{...}
Expand Down
4 changes: 2 additions & 2 deletions lib/bumpver.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
# ---------------------------------------------------------------------
# Config

config_version = "1.11.5"
config_date = date(2023, 10, 27)
config_version = "1.11.6"
config_date = date(2023, 11, 8)
config_files = [
('lib/bumpver.py', 'config_version = "{major}.{minor}.{patch}"'),
('lib/bumpver.py', 'config_date = date({date:%Y, %-m, %-d})'),
Expand Down
Binary file modified lib/plugin/gtools_unix_v2.plugin
Binary file not shown.
Binary file modified lib/plugin/gtools_unix_v3.plugin
Binary file not shown.
Binary file modified lib/plugin/gtools_windows_v2.plugin
Binary file not shown.
Binary file modified lib/plugin/gtools_windows_v3.plugin
Binary file not shown.
2 changes: 1 addition & 1 deletion src/ado/_gtools_internal.ado
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*! version 1.11.5 27Oct2023 Mauricio Caceres Bravo, [email protected]
*! version 1.11.6 08Nov2023 Mauricio Caceres Bravo, [email protected]
*! gtools function internals

* rc 17000
Expand Down
2 changes: 1 addition & 1 deletion src/ado/gtools.ado
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*! version 1.11.5 27Oct2023 Mauricio Caceres Bravo, [email protected]
*! version 1.11.6 08Nov2023 Mauricio Caceres Bravo, [email protected]
*! Program for managing the gtools package installation

capture program drop gtools
Expand Down
4 changes: 2 additions & 2 deletions src/gtools.pkg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
v 1.11.5
v 1.11.6
d
d 'GTOOLS': Faster implementation of common Stata commands optimized for large datasets
d
Expand Down Expand Up @@ -63,7 +63,7 @@ d
d Author: Mauricio Caceres Bravo
d Support: email [email protected]
d
d Distribution-Date: 20231027
d Distribution-Date: 20231108
d
f _gtools_internal.ado
f _gtools_internal.mata
Expand Down
4 changes: 2 additions & 2 deletions src/plugin/gtools.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
* Updated: Mon Dec 05 09:40:10 EST 2022
* Purpose: Stata plugin for faster group operations
* Note: See stata.com/plugins for more on Stata plugins
* Version: 1.11.5
* Version: 1.11.6
*********************************************************************/

/**
* @file gtools.c
* @author Mauricio Caceres Bravo
* @date 27 Oct 2023
* @date 08 Nov 2023
* @brief Stata plugin
*
* This file should only ever be called from gtools.ado
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/gtools.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "spi/stplugin.h"
#include "common/gttypes.h"

#define GTOOLS_VERSION "1.11.5"
#define GTOOLS_VERSION "1.11.6"

/*
* Style
Expand Down
4 changes: 2 additions & 2 deletions src/plugin/regress/gregress.c
Original file line number Diff line number Diff line change
Expand Up @@ -2566,7 +2566,7 @@ ST_retcode gf_regress_absorb(
ghptr = AbsorbHashes;
for (k = 0; k < kabs; k++, ghptr++) {
*kmodel += ghptr->nlevels;
if ( *njabsptr != NULL ) {
if ( njabsptr != NULL ) {
**njabsptr = ghptr->nlevels; (*njabsptr)++;
}
}
Expand Down Expand Up @@ -2618,7 +2618,7 @@ ST_retcode gf_regress_absorb_iter(
if (rc == 17902) return(sf_oom_error("sf_regress", "AbsorbHashes")); else if (rc) goto exit;

ghptr = AbsorbHashes;
if ( *njabsptr != NULL ) {
if ( njabsptr != NULL ) {
for (k = 0; k < kabs; k++, ghptr++) {
**njabsptr = ghptr->nlevels; (*njabsptr)++;
}
Expand Down
2 changes: 1 addition & 1 deletion src/stata.toc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
v 1.11.5
v 1.11.6
d Mauricio Caceres Bravo, [email protected]
p 'GTOOLS': Faster implementation of common Stata commands for big data
2 changes: 1 addition & 1 deletion src/test/gtools_tests.do
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Created: Tue May 16 07:23:02 EDT 2017
* Updated: Mon Dec 05 09:39:49 EST 2022
* Purpose: Unit tests for gtools
* Version: 1.11.5
* Version: 1.11.6
* Manual: help gtools
* Note: You may need to run `ftools, compile` and `reghdfe, compile`
* to test gtools against ftools functions and reghdfe.
Expand Down

0 comments on commit 22be192

Please sign in to comment.