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

merge master #3

Merged
merged 79 commits into from Apr 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
c38e229
Add monaghan2019cognitive
CHIELDOnline Mar 11, 2019
067ccb6
Add monaghan2019cognitive
CHIELDOnline Mar 11, 2019
944b3d0
Add contributors
CHIELDOnline Mar 11, 2019
2ce3cbc
Add fisher2009foxp2
CHIELDOnline Mar 12, 2019
99aa5ac
Add fisher2009foxp2
CHIELDOnline Mar 12, 2019
19a1fd8
Add contributors
CHIELDOnline Mar 12, 2019
53e55c6
subsistEnce
SimonGreenhill Mar 14, 2019
e38fed7
Merge pull request #509 from CHIELDOnline/doc_monaghan2019cognitive15…
seannyD Mar 14, 2019
975052a
Merge pull request #510 from CHIELDOnline/doc_fisher2009foxp215524055…
seannyD Mar 14, 2019
d897937
Merge pull request #512 from SimonGreenhill/r401
seannyD Mar 14, 2019
57d3f4d
rebuild
CHIELDOnline Mar 14, 2019
5be99b9
Add crawford08
CHIELDOnline Mar 17, 2019
af87879
Add crawford08
CHIELDOnline Mar 17, 2019
1ab2997
Add contributors
CHIELDOnline Mar 17, 2019
86ef708
Merge pull request #513 from CHIELDOnline/doc_crawford081552785738518
seannyD Mar 19, 2019
2111af2
rebuild
CHIELDOnline Mar 19, 2019
dc1e144
Add sterelny2016cumulative
CHIELDOnline Mar 19, 2019
a720e21
Add sterelny2016cumulative
CHIELDOnline Mar 19, 2019
9bde09a
Add contributors
CHIELDOnline Mar 19, 2019
a540411
Add hayakawa2016using
CHIELDOnline Mar 19, 2019
aca79cc
Add hayakawa2016using
CHIELDOnline Mar 19, 2019
6657aae
Add contributors
CHIELDOnline Mar 19, 2019
103dc8c
Merge pull request #514 from CHIELDOnline/doc_sterelny2016cumulative1…
seannyD Mar 19, 2019
46a680a
Merge pull request #515 from CHIELDOnline/doc_hayakawa2016using155300…
seannyD Mar 19, 2019
4206beb
rebuild
CHIELDOnline Mar 19, 2019
02dbcb6
Add majid2018differential
CHIELDOnline Mar 20, 2019
3a775c0
Add majid2018differential
CHIELDOnline Mar 20, 2019
c7dc0f0
Add contributors
CHIELDOnline Mar 20, 2019
b780047
Merge pull request #516 from CHIELDOnline/doc_majid2018differential15…
seannyD Mar 20, 2019
2ad26f3
rebuild
CHIELDOnline Mar 20, 2019
2f8aecb
Add crespi2007sly
CHIELDOnline Mar 21, 2019
1db246f
Add crespi2007sly
CHIELDOnline Mar 21, 2019
9584ddc
Add contributors
CHIELDOnline Mar 21, 2019
0ae287e
Merge pull request #517 from CHIELDOnline/doc_crespi2007sly1553184284582
seannyD Mar 22, 2019
8ee0bed
rebuild
CHIELDOnline Mar 22, 2019
b7abb7c
Add kashima2014language
CHIELDOnline Mar 22, 2019
9f9d036
Add kashima2014language
CHIELDOnline Mar 22, 2019
1362ab0
Add contributors
CHIELDOnline Mar 22, 2019
bda50ec
Merge pull request #518 from CHIELDOnline/doc_kashima2014language1553…
seannyD Mar 26, 2019
b14fbe0
rebuild
CHIELDOnline Mar 26, 2019
c47a8f9
Add delancey_2014
CHIELDOnline Mar 26, 2019
ec97866
Add delancey_2014
CHIELDOnline Mar 26, 2019
220d42b
Add contributors
CHIELDOnline Mar 26, 2019
95cf38e
Add little2011role
CHIELDOnline Mar 26, 2019
d75a619
Add little2011role
CHIELDOnline Mar 26, 2019
febd5f0
Add contributors
CHIELDOnline Mar 26, 2019
1ef7959
Add maitz_2014
CHIELDOnline Mar 26, 2019
b83e6c9
Add maitz_2014
CHIELDOnline Mar 26, 2019
f29409f
Add contributors
CHIELDOnline Mar 26, 2019
56830d3
Merge pull request #519 from CHIELDOnline/doc_delancey_20141553608495712
seannyD Mar 26, 2019
56cafaf
Merge pull request #520 from CHIELDOnline/doc_little2011role155361019…
seannyD Mar 26, 2019
cf1d2bf
Merge pull request #521 from CHIELDOnline/doc_maitz_20141553615091891
seannyD Mar 26, 2019
ecdec53
Add kousta2008investigating
CHIELDOnline Mar 28, 2019
86e452f
Add kousta2008investigating
CHIELDOnline Mar 28, 2019
3c4e631
Add contributors
CHIELDOnline Mar 28, 2019
5a83271
Add Pacheco_Coelho_2019
CHIELDOnline Mar 28, 2019
af48183
Add Pacheco_Coelho_2019
CHIELDOnline Mar 28, 2019
dc1df04
Add contributors
CHIELDOnline Mar 28, 2019
6cd51ea
Add ross1996contact
CHIELDOnline Mar 28, 2019
09eac1c
Add ross1996contact
CHIELDOnline Mar 28, 2019
71b3ae5
Add contributors
CHIELDOnline Mar 28, 2019
475cf95
Merge pull request #522 from CHIELDOnline/doc_kousta2008investigating…
seannyD Mar 28, 2019
96f3e38
Merge pull request #523 from CHIELDOnline/doc_Pacheco_Coelho_20191553…
seannyD Mar 28, 2019
e5de07f
Merge pull request #524 from CHIELDOnline/doc_ross1996contact15537755…
seannyD Mar 28, 2019
b7c3d9d
rebuild
CHIELDOnline Mar 28, 2019
a841d9b
Add ameel2005bilinguals
CHIELDOnline Mar 28, 2019
69034cd
Add ameel2005bilinguals
CHIELDOnline Mar 28, 2019
dcb632b
Add contributors
CHIELDOnline Mar 28, 2019
723ef10
Add kemmelmeier2004language
CHIELDOnline Mar 29, 2019
9579570
Add kemmelmeier2004language
CHIELDOnline Mar 29, 2019
297fe4e
Add contributors
CHIELDOnline Mar 29, 2019
90f4b46
Add perez2009lost
CHIELDOnline Mar 29, 2019
78ea067
Add perez2009lost
CHIELDOnline Mar 29, 2019
f8f4053
Add contributors
CHIELDOnline Mar 29, 2019
876963d
Merge pull request #525 from CHIELDOnline/doc_ameel2005bilinguals1553…
seannyD Mar 29, 2019
55412df
Merge pull request #526 from CHIELDOnline/doc_kemmelmeier2004language…
seannyD Mar 29, 2019
b822225
Merge pull request #527 from CHIELDOnline/doc_perez2009lost1553859575748
seannyD Mar 29, 2019
4fa7aa6
rebuild
CHIELDOnline Mar 29, 2019
f6e170f
Fix exporting problems when removing nodes (now just use network.dele…
CHIELDOnline Apr 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion analysis/plotNumDocumentsByYear.R
Expand Up @@ -2,10 +2,13 @@ try(setwd("~/Documents/Bristol/CHIELD/CHIELD_Online/analysis//"))

d = read.csv("../data/db/Documents.csv",stringsAsFactors = F)

decades= range(floor(d$year/10)*10)

pdf("../../Graphs/analysis/NumDocumentsByYear.pdf",
width=6, height=4)
hist(d$year,
xlab="Year",
ylab="Number of documents",
main="")
main="",
breaks=seq(decades[1],decades[2]+10,by=10))
dev.off()
3 changes: 1 addition & 2 deletions analysis/variableIncreaseCurve.R
Expand Up @@ -59,8 +59,7 @@ plot(newdata$numDocuments,
xlim=range(newdata$numDocuments),
ylim=c(0,max(predictedCurve)),
lty=2,col=2)
abline(0,1,lty=2)

#abline(0,1,lty=2)
points(1:length(cumUniqueVariables.mean),
cumUniqueVariables.mean,
xlab="Number of documents",
Expand Down
124 changes: 122 additions & 2 deletions app/Site/downloads/CHIELD.bib
Expand Up @@ -14,6 +14,15 @@ @Article{amano2014global
pages = {20141574},
year = {2014},
publisher = {The Royal Society},
} @Article{ameel2005bilinguals,
title = {How bilinguals solve the naming problem},
author = {Eef Ameel and Gert Storms and Barbara C Malt and Steven A Sloman},
journal = {Journal of memory and language},
volume = {53},
number = {1},
pages = {60--80},
year = {2005},
publisher = {Elsevier},
} @Article{Arbib2008PrimateVG,
title = {Primate vocalization, gesture, and the evolution of human language.},
author = {Michael A. Arbib and Katja Liebal and Simone Pika},
Expand Down Expand Up @@ -424,6 +433,15 @@ @Article{creanza2017greater
pages = {20170171},
year = {2017},
publisher = {The Royal Society},
} @Article{crespi2007sly,
title = {Sly FOXP2: genomic conflict in the evolution of language},
author = {Bernard J Crespi},
journal = {Trends in ecology \& evolution},
volume = {22},
number = {4},
pages = {174--175},
year = {2007},
publisher = {Elsevier},
} @Article{crespi2017segregating,
title = {Segregating polymorphisms of FOXP2 are associated with measures of inner speech, speech fluency and strength of handedness in a healthy population},
author = {Bernard Crespi and Silven Read and Peter Hurd},
Expand Down Expand Up @@ -522,7 +540,7 @@ @Article{delancey_2014
year = {2014},
volume = {1},
number = {1},
pages = {59-82},
pages = {59--82},
} @Article{demille2018worldwide,
abstract = {DCDC2 is a gene strongly associated with components of the phonological processing system in animal models and in multiple independent studies of populations and languages. We propose that it may also influence population-level variation in language component usage. To test this hypothesis, we investigated the evolution and worldwide distribution of the READ1 regulatory element within DCDC2, and compared its distribution with variation in different language properties. The mutational history of READ1 was estimated by examining primate and archaic hominin sequences. This identified duplication and expansion events, which created a large number of polymorphic alleles based on internal repeat units (RU1 and RU2). Association of READ1 alleles was studied with respect to the numbers of consonants and vowels for languages in 43 human populations distributed across five continents. Using population-based approaches with multivariate ANCOVA and linear mixed effects analyses, we found that the RU1-1 allele group of READ1 is significantly associated with the number of consonants within languages independent of genetic relatedness, geographic proximity, and language family. We propose that allelic variation in READ1 helped create a subtle cognitive bias that was amplified by cultural transmission, and ultimately shaped consonant use by different populations over time.},
title = {Worldwide distribution of the DCDC2 READ1 regulatory element and its relationship with phoneme variation across languages},
Expand Down Expand Up @@ -743,6 +761,15 @@ @Article{fisher2006eloquent
pages = {9},
year = {2006},
publisher = {Nature Publishing Group},
} @Article{fisher2009foxp2,
title = {FOXP2 as a molecular window into speech and language},
author = {Simon E Fisher and Constance Scharff},
journal = {Trends in Genetics},
volume = {25},
number = {4},
pages = {166--177},
year = {2009},
publisher = {Elsevier},
} @Article{fitch2018animals,
title = {What animals can teach us about human language: The phonological continuity hypothesis},
author = {W Tecumseh Fitch},
Expand Down Expand Up @@ -934,6 +961,15 @@ @Article{hay2007phoneme
pages = {388--400},
year = {2007},
publisher = {Linguistic Society of America},
} @Article{hayakawa2016using,
title = {Using a foreign language changes our choices},
author = {Sayuri Hayakawa and Albert Costa and Alice Foucart and Boaz Keysar},
journal = {Trends in Cognitive Sciences},
volume = {20},
number = {11},
pages = {791--793},
year = {2016},
publisher = {Elsevier},
} @Article{hayes2009natural,
title = {Natural and unnatural constraints in Hungarian vowel harmony},
author = {Bruce Hayes and Péter Siptár and Kie Zuraw and Zsuzsa Londe},
Expand Down Expand Up @@ -1038,6 +1074,22 @@ @Article{kashima1998culture
pages = {461--486},
year = {1998},
publisher = {Sage Publications Sage CA: Thousand Oaks, CA},
} @Article{kashima2014language,
title = {Language and culture},
author = {Yoshihisa Kashima and Emiko S Kashima and Evan Kidd and {others}},
journal = {The Oxford handbook of language and social psychology},
pages = {46--51},
year = {2014},
publisher = {Oxford University Press New York, NY},
} @Article{kemmelmeier2004language,
title = {Language and self-construal priming: A replication and extension in a Hong Kong sample},
author = {Markus Kemmelmeier and Belinda Yan-Ming Cheng},
journal = {Journal of Cross-Cultural Psychology},
volume = {35},
number = {6},
pages = {705--712},
year = {2004},
publisher = {Sage Publications Sage CA: Thousand Oaks, CA},
} @Article{kemp2012kinship,
title = {Kinship categories across languages reflect general communicative principles},
author = {Charles Kemp and Terry Regier},
Expand Down Expand Up @@ -1099,6 +1151,15 @@ @Article{knight2017wild
number = {4},
year = {2017},
publisher = {University of Chicago Press},
} @Article{kousta2008investigating,
title = {Investigating linguistic relativity through bilingualism: The case of grammatical gender.},
author = {Stavroula-Thaleia Kousta and David P Vinson and Gabriella Vigliocco},
journal = {Journal of Experimental Psychology: Learning, Memory, and Cognition},
volume = {34},
number = {4},
pages = {843},
year = {2008},
publisher = {American Psychological Association},
} @Article{kroll1986lexical,
title = {Lexical access for concrete and abstract words.},
author = {Judith F Kroll and Jill S Merves},
Expand Down Expand Up @@ -1315,6 +1376,15 @@ @Article{majid2004can
pages = {108--114},
year = {2004},
publisher = {Elsevier},
} @Article{majid2018differential,
title = {Differential coding of perception in the world’s languages},
author = {Asifa Majid and Seán G Roberts and Ludy Cilissen and Karen Emmorey and Brenda Nicodemus and Lucinda O’grady and Bencie Woll and Barbara LeLan and Hilário {De Sousa} and Brian L Cansler and Shakila Shayani and Connie {de Vos} and Gunter Senft and N. J. Enfield and Rogayah A. Razak and Sebastian Fedden and Sylvia Tufvesson and Mark Dingemanse and Ozge Ozturk and Penelope Brown and Clair Hill and Olivier Le Guen and Vincent Hirtzel and Rik {van Gijn} and Mark A. Sicoli and Stephen C. Levinson},
journal = {Proceedings of the National Academy of Sciences},
volume = {115},
number = {45},
pages = {11369--11376},
year = {2018},
publisher = {National Acad Sciences},
} @Article{Marck1986,
author = {Jeffrey C. Marck},
journal = {Journal of the Polynesian Society},
Expand Down Expand Up @@ -1410,7 +1480,7 @@ @Article{monaghan2019cognitive
date-added = {2019-02-18 11:06:51 +0000},
date-modified = {2019-02-18 11:07:58 +0000},
journal = {Cognition},
pages = {147-158},
pages = {147--158},
title = {Cognitive influences in language evolution: Psycholinguistic predictors of loan word borrowing},
volume = {186},
year = {2019},
Expand Down Expand Up @@ -1538,6 +1608,18 @@ @Article{onnis2018language
pages = {132--146},
year = {2018},
publisher = {Elsevier},
} @Article{Pacheco_Coelho_2019,
doi = {10.1098/rspb.2019.0242},
url = {https://doi.org/10.1098%2Frspb.2019.0242},
year = {2019},
month = {mar},
publisher = {The Royal Society},
volume = {286},
number = {1899},
pages = {20190242},
author = {Marco Túlio Pacheco Coelho and Elisa Barreto Pereira and Hannah J. Haynie and Thiago F. Rangel and Patrick Kavanagh and Kathryn R. Kirby and Simon J. Greenhill and Claire Bowern and Russell D. Gray and Robert K. Colwell and Nicholas Evans and Michael C. Gavin},
title = {Drivers of geographical patterns of North American language diversity},
journal = {Proceedings of the Royal Society B: Biological Sciences},
} @Article{pagel2013ultraconserved,
title = {Ultraconserved words point to deep language ancestry across Eurasia},
author = {Mark Pagel and Quentin D Atkinson and Andreea S Calude and Andrew Meade},
Expand Down Expand Up @@ -1585,6 +1667,15 @@ @Article{pederson1998semantic
pages = {557--589},
year = {1998},
publisher = {Linguistic Society of America},
} @Article{perez2009lost,
title = {Lost in translation? Item validity in bilingual political surveys},
author = {Efrén O Pérez},
journal = {The Journal of politics},
volume = {71},
number = {4},
pages = {1530--1548},
year = {2009},
publisher = {Cambridge University Press New York, USA},
} @Article{perez2017language,
title = {Language Shapes People's Time Perspective and Support for Future-Oriented Policies},
author = {Efrén O Pérez and Margit Tavits},
Expand Down Expand Up @@ -1900,6 +1991,15 @@ @Article{sterelny2014paleolithic
pages = {65--77},
year = {2014},
publisher = {Springer},
} @Article{sterelny2016cumulative,
title = {Cumulative cultural evolution and the origins of language},
author = {Kim Sterelny},
journal = {Biological Theory},
volume = {11},
number = {3},
pages = {173--186},
year = {2016},
publisher = {Springer},
} @Article{szamado2006selective,
title = {Selective Scenarios for the Emergence of Natural Language},
volume = {21},
Expand Down Expand Up @@ -2264,6 +2364,17 @@ @InBook{gentner1982nouns
title = {Why Nouns are Learned Before Verbs: Linguistic Relativity versus Natural Partitioning},
volume = {Language development: Language, thought and Culture},
year = {1982},
} @InBook{ross1996contact,
author = {Malcolm D Ross},
chapter = {8},
date-added = {2019-03-28 12:17:02 +0000},
date-modified = {2019-03-28 12:18:55 +0000},
editor = {Mark Durie and Malcolm D Ross},
pages = {180},
publisher = {Oxford University Press on Demand},
title = {Contact-induced Change and the Comparative},
volume = {The comparative method reviewed: Regularity and irregularity in language change},
year = {1996},
} @InBook{van2005language,
author = {George Van Driem},
chapter = {9},
Expand Down Expand Up @@ -2473,6 +2584,15 @@ @InProceedings{cangelosi01howNouns
url = {http://www.isrl.uiuc.edu/~amag/langev/paper/cangelosi01howNouns.html},
year = {2001},
bdsk-url-1 = {http://www.isrl.uiuc.edu/~amag/langev/paper/cangelosi01howNouns.html},
} @InProceedings{crawford08,
author = {Clifford Crawford},
title = {An evolutionary account of loanword-induced sound change in {J}apanese},
booktitle = {Proceedings of the 31st Annual {P}enn {L}inguistics {C}olloquium},
year = {2008},
volume = {14},
number = {1},
series = {University of {P}ennsylvania Working Papers in Linguistics},
pages = {57-70},
} @InProceedings{demolin2018acoustic,
author = {Didier Demolin},
booktitle = {The Evolution of Language: Proceedings of the 12th International Conference (EVOLANGXII)},
Expand Down
49 changes: 26 additions & 23 deletions app/Site/js/visualisation/GUI_for_explore.js
Expand Up @@ -72,27 +72,29 @@ function updateRecord(response,type){
}

function updateGridFromNetwork(){
var edges = network_edges.get();
var edges = network_edges.get();
var rows = [];

for(var i=0;i<edges.length;++i){
var edge = edges[i];
var newRow = [
null,
network_nodes.get(edge.from).label,
edge.causal_relation,
network_nodes.get(edge.to).label,
edge.cor,
edge.stage,
edge.studyType,
//'<a href="document.html?key='+ edge.bibref +'">' + edge.citation + "</a>",
//null,
//null
edge.citation,
edge.bibref,
edge.confirmed // Confirmed
];
rows.push(newRow);
if((network_nodes.get(edge.from)!=null) && (network_nodes.get(edge.to)!=null)){
var newRow = [
null,
network_nodes.get(edge.from).label,
edge.causal_relation,
network_nodes.get(edge.to).label,
edge.cor,
edge.stage,
edge.studyType,
//'<a href="document.html?key='+ edge.bibref +'">' + edge.citation + "</a>",
//null,
//null
edge.citation,
edge.bibref,
edge.confirmed // Confirmed
];
rows.push(newRow);
}
}
dtable.clear();
dtable.rows.add(rows);
Expand Down Expand Up @@ -176,16 +178,17 @@ function getMeanNodePositions(){
}

function removeVariableViaNetwork(){
var n = network.getSelectedNodes();
for(var i=0;i<n.length;++i){
removeVar(n,false);
}
network.deleteSelected();
//var n = network.getSelectedNodes();
//for(var i=0;i<n.length;++i){
// removeVar(n,false);
//}
// Also remove any edges:
// (selecting a variable will select all connected edges,
// which should be deleted above, but edges may be selected
// in addition)
var selectedEdges = network.getSelectedEdges();
network_edges.remove(selectedEdges);
//var selectedEdges = network.getSelectedEdges();
//network_edges.remove(selectedEdges);
updateGridFromNetwork();
}

Expand Down
4 changes: 2 additions & 2 deletions app/Site/js/visualisation/exportToDot.js
@@ -1,7 +1,7 @@
var dotEdgeTypes = {
">": 'arrowhead="normal",arrowtail="none"',
"<=>": 'arrowhead="normal",arrowtail="normal"',
"<": 'arrowhead="none",arrowtail="normal"',
"<=>": 'dir="both"',
"<": 'arrowhead="none",dir="back"',
"~": 'arrowhead="none",arrowtail="none",style="dashed"',
"/>":'arrowhead="tee",arrowtail="none"',
"/=":'arrowhead="tee",arrowtail="none"',
Expand Down