diff --git a/.classpath b/.classpath index 8ce4936..2835bf6 100644 --- a/.classpath +++ b/.classpath @@ -13,5 +13,7 @@ + + diff --git a/.gitignore b/.gitignore index d1e6008..44641b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +*tmp.nlogo + /bin/ target/ /test/tmp +/test/tmptmp \ No newline at end of file diff --git a/CREDITS.TXT b/CREDITS.TXT index 34c02b7..3c60359 100644 --- a/CREDITS.TXT +++ b/CREDITS.TXT @@ -1,4 +1,4 @@ -Copyright 2013 Forrest Stonedahl & Uri Wilensky +Copyright 2013-2017 Forrest Stonedahl & Uri Wilensky The BehaviorSearch software was initially developed as part of Forrest Stonedahl's doctoral thesis research, with adviser Uri Wilensky at the Center for Connected Learning and Computer-Based Modeling at Northwestern University. It is an open source project, and new contributors/developers are welcome (contact feedback@behaviorsearch.org if interested). diff --git a/build.sbt b/build.sbt index c244dfd..7e48c3e 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,11 @@ libraryDependencies ++= Seq( "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4", "org.ow2.asm" % "asm-all" % "5.0.4", "org.parboiled" %% "parboiled" % "2.1.3", - "com.novocode" % "junit-interface" % "0.11" % "test" + "com.novocode" % "junit-interface" % "0.11" % "test", + "com.google.code.gson" % "gson" % "1.7.1" +// libraryDependencies += "org.moeaframework" % "moeaframework" % "2.12" +// PROBLEM: MOEA 2.12 isn't good enough, since I need my custom contributions (already merged to master, but not released) + ) libraryDependencies ++= { diff --git a/documentation/tutorialFx.html b/documentation/tutorialFx.html index 5c8f8dd..de6ae6c 100644 --- a/documentation/tutorialFx.html +++ b/documentation/tutorialFx.html @@ -9,6 +9,28 @@ BehaviorSearch Documentation + + + + +