diff --git a/.gitignore b/.gitignore
index 9e76727..552fad7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@
 *.log
 *.synctex.gz
 .Rproj.user
+<<<<<<< HEAD
+=======
 .Rhistory
+>>>>>>> bd13a62b89d8db9ab6ef3a397f69c56a6a749368
diff --git a/rescwarl-wugniz.R b/rescwarl-wugniz.R
new file mode 100644
index 0000000..e0f9e2e
--- /dev/null
+++ b/rescwarl-wugniz.R
@@ -0,0 +1,59 @@
+
+library(ndl)
+
+# create sequence of learning events
+n = 1000
+dat = data.frame(
+  backgroundCue = rep("bird",  n),
+  colorCue = c(rep("red", n/2), rep("blue", n/2))
+)
+set.seed(314)
+dat = dat[sample(1:nrow(dat)),]
+rownames(dat)=1:n
+dat$category = ifelse(dat$colorCue=="red", "wug", "niz")
+
+#put in the right format
+dat$Frequency=1
+dat$Cues = paste(dat$backgroundCue, dat$colorCue, sep="_")
+dat$Outcomes = dat$category
+
+#rescorla wagner function -> association between "red" and "wug"
+dat.rw = RescorlaWagner(dat, traceCue="red", traceOutcome="wug", random=F)
+plot(dat.rw)
+
+#rescorla wagner function -> association between "bird" and "wug"
+dat.bw = RescorlaWagner(dat, traceCue="bird", traceOutcome="wug", random=F)
+plot(dat.bw)
+
+#rescorla wagner function -> association between "bird" and "niz"
+dat.bn = RescorlaWagner(dat, traceCue="bird", traceOutcome = "niz", random = F)
+plot(dat.bn)
+
+#rescorla wagner function -> association between "red" and "niz"
+dat.rn = RescorlaWagner(dat, traceCue="red", traceOutcome = "niz", random = F)
+plot(dat.rn)
+
+###############################
+
+redniz = RescorlaWagner(dat, traceCue="red", traceOutcome="niz", random=F)
+birdniz = RescorlaWagner(dat, traceCue="bird", traceOutcome="niz", random=F)
+plot(1:n, redniz$weightvector+birdniz$weightvector, type="l")
+abline(h=0)
+
+redwug = RescorlaWagner(dat, traceCue="red", traceOutcome="wug", random=F)
+birdwug = RescorlaWagner(dat, traceCue="bird", traceOutcome="wug", random=F)
+plot(1:n, redwug$weightvector+birdwug$weightvector, type="l")
+abline(h=1)
+
+
+
+
+
+
+
+
+
+
+
+
+