Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All Commits #1

Open
wants to merge 146 commits into
base: empty-branch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
91a09f6
data and code
andreslajous Feb 18, 2015
b52f24d
town by size
andreslajous Feb 18, 2015
c6c9ee8
Sampling Municipalities
leahmgreisman Feb 19, 2015
327ab29
Merge pull request #1 from leahmgreisman/master
andreslajous Feb 19, 2015
04a820f
Added some more notes and ideas
leahmgreisman Feb 19, 2015
5e95c9f
added distritos oaxaca file
andreslajous Feb 19, 2015
6b5d35e
Fixing and improving code
leahmgreisman Feb 19, 2015
5caa0fa
Fixing and Improving Code pt 2, separating Oaxaca
leahmgreisman Feb 19, 2015
cb710c9
created tables with municipalities whose 75% of its population lives …
Feb 20, 2015
0f4a1f6
Fixed code to calculate sample minus Oaxacan distritos
leahmgreisman Feb 20, 2015
2cd692d
Forgot to save
leahmgreisman Feb 20, 2015
d46b6a0
added distritos to oaxaca municipalities, joined new oaxaca municipal…
Feb 21, 2015
78a028e
Merge pull request #2 from leahmgreisman/master
andreslajous Feb 21, 2015
e4b2067
added a table with all Oaxaca municipalities and all distrito labels.
Feb 21, 2015
a289855
fix comments
Feb 21, 2015
acb30c4
Added variables
leahmgreisman Feb 23, 2015
01bc233
Merge pull request #3 from leahmgreisman/master
andreslajous Feb 23, 2015
6aa1fdc
added dummy variable for df
leahmgreisman Feb 24, 2015
14c73ae
added illiteracy csv
andreslajous Feb 24, 2015
bf221de
Fixed Dummy Variable
leahmgreisman Feb 25, 2015
da8bc1a
Caught error
leahmgreisman Feb 25, 2015
edf259e
Merge pull request #4 from leahmgreisman/master
andreslajous Feb 28, 2015
f09ff11
corrected mistakes, made the code more efficient, created all control…
Feb 28, 2015
d2692d1
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Feb 28, 2015
4f4c653
changes with new databases
andreslajous Feb 28, 2015
13d670d
added comments with the information we will need from the censo agricola
andreslajous Feb 28, 2015
bff20fb
Notes about data we don't have
leahmgreisman Mar 7, 2015
e8d6104
added all variables for oax
leahmgreisman Mar 9, 2015
960525d
files that were missing
andreslajous Mar 9, 2015
295b757
added conteo 95
andreslajous Mar 9, 2015
00ba25f
merge
andreslajous Mar 9, 2015
9d42dcd
map
andreslajous Mar 9, 2015
5395801
Fixed Oaxaca and built full sample so far
leahmgreisman Mar 9, 2015
9c9b11e
Whoops!
leahmgreisman Mar 9, 2015
e1c46c1
created function to correct names for rural variable files
andreslajous Mar 10, 2015
63c154f
merged with agricultural variable function
andreslajous Mar 10, 2015
120cc99
created "name" variable for census data in order to join with agricul…
andreslajous Mar 10, 2015
051e6d9
Cleaning up
leahmgreisman Mar 12, 2015
b91abc6
production units by type
andreslajous Mar 12, 2015
e7a7eb4
small change
andreslajous Mar 12, 2015
7d5f3b2
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Mar 12, 2015
742eb63
Working on RMD
leahmgreisman Mar 12, 2015
084ba30
Working on Maps
leahmgreisman Mar 13, 2015
c2cd314
Working on neg binomial regressions
leahmgreisman Mar 14, 2015
da44505
More work on regressions
leahmgreisman Mar 14, 2015
a7e1278
working on oaxaca agricultural variables
leahmgreisman Mar 14, 2015
3a2ffee
land area correct file
andreslajous Mar 15, 2015
4e43bff
reworking/reorganizing
leahmgreisman Mar 15, 2015
87e67f2
newest version
leahmgreisman Mar 15, 2015
97faaeb
corrected ejidal, comunal
andreslajous Mar 15, 2015
4419783
no change
andreslajous Mar 15, 2015
0cc696c
corrected municipality names and added mun_names_errors file necessar…
andreslajous Mar 16, 2015
8eb7244
removed libraries we don't need.
andreslajous Mar 16, 2015
d1c6cab
conflict resolved
leahmgreisman Mar 16, 2015
4c883ea
part 1 knit successful
leahmgreisman Mar 16, 2015
0417e77
working on maps and regressions
leahmgreisman Mar 16, 2015
badcd9f
Regressions - Latest
leahmgreisman Mar 16, 2015
1802fef
merge
andreslajous Mar 16, 2015
73047eb
merge
andreslajous Mar 16, 2015
37e24de
New Version
leahmgreisman Mar 16, 2015
cddb7b9
merge again
andreslajous Mar 16, 2015
6d4705e
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Mar 16, 2015
385db23
maps
leahmgreisman Mar 16, 2015
9ef3f58
add the pop.surface variable adjusted the files pointing at the maps
andreslajous Mar 16, 2015
130239e
merged map dbf with variables form sample
andreslajous Mar 16, 2015
6f8b0e9
old municipios
andreslajous Mar 16, 2015
b7b2721
commented out the model. resolved the conflict. tested kintting.
andreslajous Mar 16, 2015
2e16769
knitted file
andreslajous Mar 16, 2015
5fbffc6
old file
leahmgreisman Mar 16, 2015
68ff9f7
archiving
leahmgreisman Mar 16, 2015
7d42789
Merged the polygons in the distritos in Oaxaca in order to get the co…
andreslajous Mar 18, 2015
9a075dd
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Mar 18, 2015
8fa6982
Tidied Up R Markdown
leahmgreisman Mar 22, 2015
1ac2d3d
used maps with merged distritos, change the source for elevation.
andreslajous Mar 22, 2015
54b3297
fixed merge conflicts
andreslajous Mar 22, 2015
fe879ae
fixed a couple repeats
leahmgreisman Mar 22, 2015
793666a
last knit.
andreslajous Mar 22, 2015
a2326cb
added code to suppress warnings
leahmgreisman Mar 22, 2015
ec303f8
working on neg binomial regressions
leahmgreisman Mar 25, 2015
aff0536
added regression tables
leahmgreisman Mar 26, 2015
7b18dce
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Mar 29, 2015
9f6f406
knitted newest version with nb regression
andreslajous Mar 29, 2015
c5d2386
fixed tables
leahmgreisman Apr 3, 2015
9bc1f72
added thiel index for main dataframe and oaxaca dataframe. also added…
andreslajous Apr 3, 2015
6a5f03f
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Apr 3, 2015
bbdf8d8
everything seems to be working now. however something is way off with…
andreslajous Apr 3, 2015
5a8a740
integrating
leahmgreisman Apr 3, 2015
d8d4d07
Merge remote-tracking branch 'origin/master'
leahmgreisman Apr 3, 2015
5a9b799
new version
leahmgreisman Apr 3, 2015
b5f7f9d
fixed repeated code
leahmgreisman Apr 3, 2015
a980947
fixed tables and log/log10
leahmgreisman Apr 3, 2015
74b5596
added the weighted sd elevation by population
andreslajous Apr 4, 2015
957f5ff
Added postscript and one other thing
leahmgreisman Apr 4, 2015
5f9511b
old map files deleted
andreslajous Apr 4, 2015
ffe0a63
last changes trying to fix the htmlreg unsuccessfully.
andreslajous Apr 4, 2015
893a997
ran without maps and with tables in text. were not able to make html …
andreslajous Apr 4, 2015
8019e12
Sample size fixes
leahmgreisman Apr 10, 2015
04b34d8
Fixed weigh.elev variable
leahmgreisman Apr 10, 2015
dfa65c3
Added potential variable selection problems
leahmgreisman Apr 10, 2015
94e9818
Fixed tables yaaaay!
leahmgreisman Apr 10, 2015
30cb96b
changed source for elevation. fixed literacy rate, some changes to NA…
andreslajous Apr 11, 2015
9f56241
new elevation source INEGI catalog 2000
andreslajous Apr 11, 2015
ffd26a4
map files with distritos
andreslajous Apr 11, 2015
0e38395
added maps back. adjusted decimals in coefficients. tested knitting.
andreslajous Apr 11, 2015
c662e88
Merge commit '9f56241c397becf722046d10ca7629e621dfc995' into all-commits
lukebaker Apr 13, 2015
0dccfe4
Merge pull request #2 from andreslajous/master
lukebaker Apr 13, 2015
d365948
Villarreal's dissertation
leahmgreisman Apr 15, 2015
da523f9
adding datasets
leahmgreisman Apr 15, 2015
39c10bf
added and selected variables for poverty, gini, doctors, police, HDI,…
andreslajous Apr 18, 2015
af998c7
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Apr 18, 2015
deb49a5
updated problematic variables list
leahmgreisman Apr 24, 2015
1adaa77
Created Rmd for extension, noticed some things
leahmgreisman Apr 24, 2015
4e71a78
fixed most naming differences in order to join agricultural variables…
andreslajous Apr 24, 2015
4794c82
added comments
andreslajous Apr 24, 2015
e14f356
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Apr 24, 2015
5e185f1
Working on code
leahmgreisman Apr 25, 2015
17c8375
updating
leahmgreisman Apr 25, 2015
e6b8c57
functions
leahmgreisman Apr 25, 2015
cc2288f
finished functions to do corrections
leahmgreisman Apr 25, 2015
8f2ba01
worked on oaxaca
leahmgreisman Apr 25, 2015
1886e46
added coffee and corn
andreslajous Apr 26, 2015
d0a00a3
added property type variable
andreslajous Apr 26, 2015
7ebbe3d
Prepped code for regressions and tables
leahmgreisman Apr 26, 2015
6c677f2
changed de function so that it only corrects special characers. each …
andreslajous Apr 26, 2015
e2ced39
finished dataframe with all agricultural variables available.
andreslajous Apr 26, 2015
e2097a4
lots of work
leahmgreisman Apr 26, 2015
fea11e0
Done except adding two variables and maps
leahmgreisman Apr 26, 2015
b74c3aa
area and maps.
andreslajous Apr 26, 2015
4fe94e6
Merge branch 'master' of github.com:andreslajous/replication
andreslajous Apr 26, 2015
61d778d
almost done...including maps and tables.
andreslajous Apr 27, 2015
8d3e4e2
Completed Extension
leahmgreisman Apr 27, 2015
cd96ceb
organizing
leahmgreisman Apr 27, 2015
07dbfe3
Merge pull request #3 from andreslajous/master
lukebaker Apr 27, 2015
d80aced
Presentation
leahmgreisman Apr 27, 2015
ce1224d
Presentation HTML
leahmgreisman Apr 27, 2015
7e528a5
Prettier presentation
leahmgreisman Apr 27, 2015
cd23f3b
Organizing
leahmgreisman Apr 27, 2015
158c6fa
responded to almost all comments
leahmgreisman May 4, 2015
77a0713
added note about town fields
leahmgreisman May 4, 2015
3f0e40b
Create response_to_comments
leahmgreisman May 5, 2015
bd13c46
added offsets
leahmgreisman May 11, 2015
de9ad43
fixed outcome variable (after offset was added), comments on maps and…
andreslajous May 12, 2015
f325912
added comments to maps, fixed outcome to use offset, changed log10 to…
andreslajous May 12, 2015
50c7553
knit with last changes.
andreslajous May 12, 2015
9f4b19c
Merge remote-tracking branch 'upstream/master' into all-commits
lukebaker May 13, 2015
abfe030
Revert "Merge remote-tracking branch 'upstream/master' into all-commits"
lukebaker May 13, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.Rproj.user
.Rhistory
.RData
768 changes: 768 additions & 0 deletions Extension Project_Final.Rmd

Large diffs are not rendered by default.

6,566 changes: 6,566 additions & 0 deletions Extension_Project_Final.html

Large diffs are not rendered by default.

860 changes: 860 additions & 0 deletions Replication Project_Final.Rmd

Large diffs are not rendered by default.

2,506 changes: 2,506 additions & 0 deletions Replication_Project_Final.html

Large diffs are not rendered by default.

Binary file added Villarreal - rural violence.pdf
Binary file not shown.
Binary file added Villarreal Dissertation.pdf
Binary file not shown.
Binary file added data/.RData
Binary file not shown.
2,472 changes: 2,472 additions & 0 deletions data/3.3 Concentrado, indicadores de pobreza por municipio.csv

Large diffs are not rendered by default.

278,742 changes: 278,742 additions & 0 deletions data/ARCH271.CSV

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/HDI_2010_UNDP.csv

Large diffs are not rendered by default.

Loading