Fix #34 - hdfe was not allowing weights

Also added test suite for that
sergiocorreia · Jul 26, 2015 · 3ec56c5 · 3ec56c5
1 parent f1bd03f
commit 3ec56c5
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 20 deletions.
diff --git a/misc/reghdfe.zip b/misc/reghdfe.zip
diff --git a/package/hdfe.ado b/package/hdfe.ado
@@ -1,4 +1,4 @@
-*! reghdfe 3.2.1 25jul2015
+*! reghdfe 3.2.2 26jul2015
 *! Sergio Correia (sergio.correia@duke.edu)
 
 
@@ -1942,7 +1942,8 @@ program define hdfe, eclass
 		local keepvars `r(varlist)'
 	}
 
-	local 0 `partial' `anything' [`weight'`exp'] , absorb(`absorb') `options' ///
+	if ("`weight'"!="") local weight_part [`weight'=`exp']
+	local 0 `partial' `anything' `weight_part' , absorb(`absorb') `options' ///
 		cluster(`clustervars') cache(save, keepvars(`keepvars'))
 
 * INITIAL CLEANUP
@@ -1962,7 +1963,7 @@ program define hdfe, eclass
 		GenUID `uid'
 	}
 
-* PROBLEM:z
+* PROBLEM:
 	* I can translate L(1/2).x into __L__x __L2__x
 	* But how can I translate i.x if I don't have the original anymore?
 
@@ -2109,7 +2110,7 @@ end
 // -------------------------------------------------------------
 
 program define Version, eclass
-    local version "3.2.1 25jul2015"
+    local version "3.2.2 26jul2015"
     ereturn clear
     di as text "`version'"
     ereturn local version "`version'"
@@ -2223,7 +2224,7 @@ program define Parse
 
 		* Check that weights are correct (e.g. with fweight they need to be integers)
 		local num_type = cond("`weight'"=="fweight", "integers", "reals")
-		local basenote "weight {res}`weightvar'{txt} can only contain strictly positive `num_type', but"
+		local basenote "{txt}weight {res}`weightvar'{txt} can only contain strictly positive `num_type', but"
 		qui cou if `weightvar'<0
 		Assert (`r(N)'==0), msg("`basenote' `r(N)' negative values were found!")  rc(402)
 		qui cou if `weightvar'==0
@@ -2232,7 +2233,7 @@ program define Parse
 		if (`r(N)'>0) di as text "`basenote' `r(N)' missing values were found (will be dropped)"
 		if ("`weight'"=="fweight") {
 			qui cou if mod(`weightvar',1) & `weightvar'<.
-			Assert (`r(N)'==0), msg("`basenote' `r(N)' non-integer values were found!") rc(401)
+			Assert (`r(N)'==0), msg("`basenote' `r(N)' non-integer values were found!" "{err} Stopping execution") rc(401)
 		}
 	}
 	local allkeys `allkeys' weightvar weighttype weightexp

diff --git a/package/hdfe.pkg b/package/hdfe.pkg
@@ -26,7 +26,7 @@ d KW: within
 d
 d Requires: Stata version 11.2
 d
-d Distribution-Date: 20150725
+d Distribution-Date: 20150726
 d
 
 f hdfe.ado

diff --git a/package/reghdfe.ado b/package/reghdfe.ado
@@ -1,4 +1,4 @@
-*! reghdfe 3.2.1 25jul2015
+*! reghdfe 3.2.2 26jul2015
 *! Sergio Correia (sergio.correia@duke.edu)
 
 
@@ -2045,7 +2045,7 @@ end
 // -------------------------------------------------------------
 
 program define Version, eclass
-    local version "3.2.1 25jul2015"
+    local version "3.2.2 26jul2015"
     ereturn clear
     di as text "`version'"
     ereturn local version "`version'"
@@ -2448,7 +2448,7 @@ program define Parse
 
 		* Check that weights are correct (e.g. with fweight they need to be integers)
 		local num_type = cond("`weight'"=="fweight", "integers", "reals")
-		local basenote "weight {res}`weightvar'{txt} can only contain strictly positive `num_type', but"
+		local basenote "{txt}weight {res}`weightvar'{txt} can only contain strictly positive `num_type', but"
 		qui cou if `weightvar'<0
 		Assert (`r(N)'==0), msg("`basenote' `r(N)' negative values were found!")  rc(402)
 		qui cou if `weightvar'==0
@@ -2457,7 +2457,7 @@ program define Parse
 		if (`r(N)'>0) di as text "`basenote' `r(N)' missing values were found (will be dropped)"
 		if ("`weight'"=="fweight") {
 			qui cou if mod(`weightvar',1) & `weightvar'<.
-			Assert (`r(N)'==0), msg("`basenote' `r(N)' non-integer values were found!") rc(401)
+			Assert (`r(N)'==0), msg("`basenote' `r(N)' non-integer values were found!" "{err} Stopping execution") rc(401)
 		}
 	}
 	local allkeys `allkeys' weightvar weighttype weightexp

diff --git a/package/reghdfe.pkg b/package/reghdfe.pkg
@@ -18,7 +18,7 @@ d KW: GMM
 d
 d Requires: Stata version 11.2
 d
-d Distribution-Date: 20150725
+d Distribution-Date: 20150726
 d
 
 f reghdfe.ado

diff --git a/source/hdfe.ado b/source/hdfe.ado
@@ -47,7 +47,8 @@ program define hdfe, eclass
 		local keepvars `r(varlist)'
 	}
 
-	local 0 `partial' `anything' [`weight'`exp'] , absorb(`absorb') `options' ///
+	if ("`weight'"!="") local weight_part [`weight'=`exp']
+	local 0 `partial' `anything' `weight_part' , absorb(`absorb') `options' ///
 		cluster(`clustervars') cache(save, keepvars(`keepvars'))
 
 * INITIAL CLEANUP
@@ -67,7 +68,7 @@ program define hdfe, eclass
 		GenUID `uid'
 	}
 
-* PROBLEM:z
+* PROBLEM:
 	* I can translate L(1/2).x into __L__x __L2__x
 	* But how can I translate i.x if I don't have the original anymore?
 

diff --git a/source/hdfe.pkg b/source/hdfe.pkg
@@ -26,7 +26,7 @@ d KW: within
 d
 d Requires: Stata version 11.2
 d
-d Distribution-Date: 20150725
+d Distribution-Date: 20150726
 d
 
 f hdfe.ado

diff --git a/source/internal/Parse.ado b/source/internal/Parse.ado
@@ -79,7 +79,7 @@ program define Parse
 
 		* Check that weights are correct (e.g. with fweight they need to be integers)
 		local num_type = cond("`weight'"=="fweight", "integers", "reals")
-		local basenote "weight {res}`weightvar'{txt} can only contain strictly positive `num_type', but"
+		local basenote "{txt}weight {res}`weightvar'{txt} can only contain strictly positive `num_type', but"
 		qui cou if `weightvar'<0
 		Assert (`r(N)'==0), msg("`basenote' `r(N)' negative values were found!")  rc(402)
 		qui cou if `weightvar'==0
@@ -88,7 +88,7 @@ program define Parse
 		if (`r(N)'>0) di as text "`basenote' `r(N)' missing values were found (will be dropped)"
 		if ("`weight'"=="fweight") {
 			qui cou if mod(`weightvar',1) & `weightvar'<.
-			Assert (`r(N)'==0), msg("`basenote' `r(N)' non-integer values were found!") rc(401)
+			Assert (`r(N)'==0), msg("`basenote' `r(N)' non-integer values were found!" "{err} Stopping execution") rc(401)
 		}
 	}
 	local allkeys `allkeys' weightvar weighttype weightexp

diff --git a/source/reghdfe.pkg b/source/reghdfe.pkg
@@ -18,7 +18,7 @@ d KW: GMM
 d
 d Requires: Stata version 11.2
 d
-d Distribution-Date: 20150725
+d Distribution-Date: 20150726
 d
 
 f reghdfe.ado

diff --git a/source/version.txt b/source/version.txt
@@ -1 +1 @@
-3.2.1 25jul2015
+3.2.2 26jul2015
diff --git a/test/test-hdfe.do b/test/test-hdfe.do
@@ -86,9 +86,11 @@ cscript "hdfe" adofile reghdfe
 
 * syntax()
 	sysuse auto, clear
-
 	hdfe price weight length, a(turn trunk) gen(R_) sample(smpl) clusterv(trunk)
 	hdfe price weight length, a(turn trunk) clear keepv(make) keepids clusterv(trunk)
+
+	sysuse auto, clear
+	hdfe price gear [w=weight], a(turn trunk) clear keepv(make) keepids clusterv(trunk)
 
 cd "D:/Github/reghdfe/test"
 exit