Skip to content

Commit 10d53be

Browse files
committed
Merge branch 'develop' for fixes to test files
2 parents 64faf87 + cd4de75 commit 10d53be

File tree

9 files changed

+44602
-120
lines changed

9 files changed

+44602
-120
lines changed

build/_gtools_internal.ado

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,6 +1717,7 @@ program _gtools_internal, rclass
17171717

17181718
if ( ("`algorithm'" != "") & ("`method'" != "") ) {
17191719
disp as err "gregress: method() is an alias for algorithm(); specify only one"
1720+
clean_all 198
17201721
exit 198
17211722
}
17221723
if ( `"`algorithm'"' == "" ) local algorithm cg
@@ -1725,6 +1726,7 @@ program _gtools_internal, rclass
17251726

17261727
if ( `maxiter' < 1 ) {
17271728
disp as err "gregress: maxiter() must be >= 1"
1729+
clean_all 198
17281730
exit 198
17291731
}
17301732

@@ -1755,6 +1757,7 @@ program _gtools_internal, rclass
17551757
}
17561758
else {
17571759
disp as err "gstats_hdfe: method() must be one of: map, squarem, cg, it"
1760+
clean_all 198
17581761
exit 198
17591762
}
17601763

build/gtools_tests.do

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ program main
4747
di "Options: `options'"
4848
di "OS: `c(os)'"
4949
di "Machine Type: `c(machine_type)'"
50+
di "Stata v: `c(stata_version)'"
5051

5152
* Run the things
5253
* --------------
@@ -100,6 +101,7 @@ program main
100101
cap ssc install egenmisc, replace
101102
cap ssc install egenmore, replace
102103
cap ssc install rangestat, replace
104+
cap ssc install reghdfe, replace
103105
* ftools, compile
104106
* reghdfe, compile
105107
}
@@ -6836,14 +6838,14 @@ program compare_inner_levelsof
68366838
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
68376839
gettoken _ l_gtools: l_gtools, p(" | ")
68386840
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
6839-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
6841+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
68406842
if ( _rc ) {
68416843
di as err " compare_levelsof (failed): glevelsof `varlist' returned different levels with rounding"
68426844
exit 198
68436845
}
68446846
}
68456847
}
6846-
di as txt " compare_levelsof (passed): glevelsof `varlist' returned similar levels as levelsof (tol = 1e-15)"
6848+
di as txt " compare_levelsof (passed): glevelsof `varlist' returned similar levels as levelsof (tol = 1e-12)"
68476849
}
68486850
else {
68496851
di as err " compare_levelsof (failed): glevelsof `varlist' returned different levels to levelsof"
@@ -6864,14 +6866,14 @@ program compare_inner_levelsof
68646866
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
68656867
gettoken _ l_gtools: l_gtools, p(" | ")
68666868
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
6867-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
6869+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
68686870
if ( _rc ) {
68696871
di as err " compare_levelsof (failed): glevelsof `varlist' returned different levels with rounding"
68706872
exit 198
68716873
}
68726874
}
68736875
}
6874-
di as txt " compare_levelsof (passed): glevelsof `varlist' returned similar levels as levelsof (tol = 1e-15)"
6876+
di as txt " compare_levelsof (passed): glevelsof `varlist' returned similar levels as levelsof (tol = 1e-12)"
68756877
}
68766878
else {
68776879
di as err " compare_levelsof (failed): glevelsof `varlist' returned different levels to levelsof"
@@ -6895,14 +6897,14 @@ program compare_inner_levelsof
68956897
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
68966898
gettoken _ l_gtools: l_gtools, p(" | ")
68976899
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
6898-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
6900+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
68996901
if ( _rc ) {
69006902
di as err " compare_levelsof (failed): glevelsof `varlist' [in] returned different levels with rounding"
69016903
exit 198
69026904
}
69036905
}
69046906
}
6905-
di as txt " compare_levelsof (passed): glevelsof `varlist' [in] returned similar levels as levelsof (tol = 1e-15)"
6907+
di as txt " compare_levelsof (passed): glevelsof `varlist' [in] returned similar levels as levelsof (tol = 1e-12)"
69066908
}
69076909
else {
69086910
di as err " compare_levelsof (failed): glevelsof `varlist' [in] returned different levels to levelsof"
@@ -6923,14 +6925,14 @@ program compare_inner_levelsof
69236925
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
69246926
gettoken _ l_gtools: l_gtools, p(" | ")
69256927
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
6926-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
6928+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
69276929
if ( _rc ) {
69286930
di as err " compare_levelsof (failed): glevelsof `varlist' [in] returned different levels with rounding"
69296931
exit 198
69306932
}
69316933
}
69326934
}
6933-
di as txt " compare_levelsof (passed): glevelsof `varlist' [in] returned similar levels as levelsof (tol = 1e-15)"
6935+
di as txt " compare_levelsof (passed): glevelsof `varlist' [in] returned similar levels as levelsof (tol = 1e-12)"
69346936
}
69356937
else {
69366938
di as err " compare_levelsof (failed): glevelsof `varlist' [in] returned different levels to levelsof"
@@ -6954,14 +6956,14 @@ program compare_inner_levelsof
69546956
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
69556957
gettoken _ l_gtools: l_gtools, p(" | ")
69566958
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
6957-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
6959+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
69586960
if ( _rc ) {
69596961
di as err " compare_levelsof (failed): glevelsof `varlist' [if] returned different levels with rounding"
69606962
exit 198
69616963
}
69626964
}
69636965
}
6964-
di as txt " compare_levelsof (passed): glevelsof `varlist' [if] returned similar levels as levelsof (tol = 1e-15)"
6966+
di as txt " compare_levelsof (passed): glevelsof `varlist' [if] returned similar levels as levelsof (tol = 1e-12)"
69656967
}
69666968
else {
69676969
di as err " compare_levelsof (failed): glevelsof `varlist' [if] returned different levels to levelsof"
@@ -6982,14 +6984,14 @@ program compare_inner_levelsof
69826984
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
69836985
gettoken _ l_gtools: l_gtools, p(" | ")
69846986
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
6985-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
6987+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
69866988
if ( _rc ) {
69876989
di as err " compare_levelsof (failed): glevelsof `varlist' [if] returned different levels with rounding"
69886990
exit 198
69896991
}
69906992
}
69916993
}
6992-
di as txt " compare_levelsof (passed): glevelsof `varlist' [if] returned similar levels as levelsof (tol = 1e-15)"
6994+
di as txt " compare_levelsof (passed): glevelsof `varlist' [if] returned similar levels as levelsof (tol = 1e-12)"
69936995
}
69946996
else {
69956997
di as err " compare_levelsof (failed): glevelsof `varlist' [if] returned different levels to levelsof"
@@ -7013,14 +7015,14 @@ program compare_inner_levelsof
70137015
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
70147016
gettoken _ l_gtools: l_gtools, p(" | ")
70157017
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
7016-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
7018+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
70177019
if ( _rc ) {
70187020
di as err " compare_levelsof (failed): glevelsof `varlist' [if] [in] returned different levels with rounding"
70197021
exit 198
70207022
}
70217023
}
70227024
}
7023-
di as txt " compare_levelsof (passed): glevelsof `varlist' if] [in] returned similar levels as levelsof (tol = 1e-15)"
7025+
di as txt " compare_levelsof (passed): glevelsof `varlist' if] [in] returned similar levels as levelsof (tol = 1e-12)"
70247026
}
70257027
else {
70267028
di as err " compare_levelsof (failed): glevelsof `varlist' [if] [in] returned different levels to levelsof"
@@ -7041,14 +7043,14 @@ program compare_inner_levelsof
70417043
gettoken l_gcmp l_gtools: l_gtools, p(" | ")
70427044
gettoken _ l_gtools: l_gtools, p(" | ")
70437045
if ( `"`l_gcmp'"' != `"`l_scmp'"' ) {
7044-
cap assert reldif(`l_gcmp', `l_scmp') < 1e-15
7046+
cap assert reldif(`l_gcmp', `l_scmp') < 1e-12
70457047
if ( _rc ) {
70467048
di as err " compare_levelsof (failed): glevelsof `varlist' [if] [in] returned different levels with rounding"
70477049
exit 198
70487050
}
70497051
}
70507052
}
7051-
di as txt " compare_levelsof (passed): glevelsof `varlist' if] [in] returned similar levels as levelsof (tol = 1e-15)"
7053+
di as txt " compare_levelsof (passed): glevelsof `varlist' if] [in] returned similar levels as levelsof (tol = 1e-12)"
70527054
}
70537055
else {
70547056
di as err " compare_levelsof (failed): glevelsof `varlist' [if] [in] returned different levels to levelsof"
@@ -11195,15 +11197,6 @@ end
1119511197

1119611198
capture program drop compare_gstats
1119711199
program compare_gstats
11198-
compare_gstats_hdfe, method(squarem)
11199-
compare_gstats_hdfe, method(cg)
11200-
compare_gstats_hdfe, method(map)
11201-
compare_gstats_hdfe, method(it)
11202-
compare_gstats_hdfe, weights method(squarem)
11203-
compare_gstats_hdfe, weights method(cg)
11204-
compare_gstats_hdfe, weights method(map)
11205-
compare_gstats_hdfe, weights method(it)
11206-
1120711200
compare_gstats_winsor
1120811201
compare_gstats_winsor, cuts(5 95)
1120911202
compare_gstats_winsor, cuts(30 70)
@@ -11212,6 +11205,15 @@ program compare_gstats
1121211205
compare_gstats_transform, weights
1121311206
compare_gstats_transform, nogreedy
1121411207
compare_gstats_transform, nogreedy weights
11208+
11209+
compare_gstats_hdfe, method(cg)
11210+
compare_gstats_hdfe, method(map)
11211+
compare_gstats_hdfe, method(it)
11212+
compare_gstats_hdfe, method(squarem)
11213+
compare_gstats_hdfe, weights method(cg)
11214+
compare_gstats_hdfe, weights method(map)
11215+
compare_gstats_hdfe, weights method(it)
11216+
compare_gstats_hdfe, weights method(squarem)
1121511217
end
1121611218

1121711219
***********************************************************************

build/gtools_tests.log

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)