v2.2.2

Makefile.am

@@ -43,10 +43,8 @@ else
 install-slidoc-recursive:
 	rm -rf $(DESTDIR)@PKGDOCDIR@/help/*
 	mkdir -p $(DESTDIR)@PKGDOCDIR@/help
-
 	SLIDOCDIR=$(DESTDIR)@PKGDOCDIR@ SLIDATADIR=$(DESTDIR)@PKGDATADIR@ NESTRCFILENAME=/dev/null \
 	  $(DESTDIR)$(exec_prefix)/bin/sli --userargs="@HELPDIRS@" $(top_srcdir)/lib/sli/install-help.sli 2>&1 > @INSTALL_HELP_LOG@
-
 	$(MAKE) SLIDOCDIR=$(DESTDIR)@PKGDOCDIR@ SLIDATADIR=$(DESTDIR)@PKGDATADIR@ NESTRCFILENAME=/dev/null \
 	  -k -C @PKGBUILDDIR@/testsuite install-slidoc 2> /dev/null
 

examples/MyModule/Makefile.am

@@ -40,6 +40,8 @@ AM_CPPFLAGS= @NEST_CPPFLAGS@ \
 
 .PHONY: install-slidoc
 
+pkgdatadir=@datadir@/nest
+
 nobase_pkgdata_DATA=\
 	sli/mymodule.sli
 

examples/MyModule/configure.ac

@@ -1,11 +1,5 @@
 AC_PREREQ(2.52)
-
-AC_INIT(mymodule, 1.0, [email protected])
-
-# These variables are exported to include/config.h
-MYMODULE_MAJOR=1
-MYMODULE_MINOR=0
-MYMODULE_PATCHLEVEL=0
+AC_INIT([mymodule], [1.0], [[email protected]])
 
 # Exporting source and build directories requires full path names.
 # Thus we have to expand.
@@ -22,7 +16,7 @@ PKGBUILDDIR=`pwd`
 # moritz, 06-26-06
 AC_CONFIG_AUX_DIR(.)
 
-AM_INIT_AUTOMAKE(nest, $MYMODULE_VERSION)
+AM_INIT_AUTOMAKE([tar-ustar])
 
 # obtain host system type; HEP 2004-12-20
 AC_CANONICAL_HOST
@@ -156,7 +150,7 @@ AC_SUBST(MAKE_FLAGS)
 AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 
-AM_CONFIG_HEADER(mymodule_config.h:mymodule_config.h.in)
+AC_CONFIG_HEADER(mymodule_config.h:mymodule_config.h.in)
 AC_CONFIG_FILES(Makefile)
 
 # -----------------------------------------------

examples/nest/HillTononi/ht_current.py

@@ -40,10 +40,6 @@
 # create neuron
 nrn = nest.Create('ht_neuron', params = {'NaP_g_peak': 1.0})
 
-# get receptor ID information, so we can connect to the
-# different synapses
-receptors = nest.GetStatus(nrn)[0]['receptor_types']
-
 # create multimeter and configure it to record all information
 # we want at 0.1ms resolution
 mm = nest.Create('multimeter')

examples/nest/Makefile.am

@@ -13,7 +13,6 @@ nobase_data_DATA=\
 	Brette_et_al_2007/hh_coba.sli\
 	Brette_et_al_2007/benchmark.sli\
 	HillTononi/ht_current.py\
-	HillTononi/smp_generator.py\
 	HillTononi/ht_poisson.py\
 	multimeter.sli
 

extras/nest-config.in

@@ -61,19 +61,19 @@ while test $# -gt 0; do
         ;;
 
     --cflags)
-        NEST_CFLAGS="-I${srcdir}/{libnestutil,librandom,sli,nestkernel,nest,topology} @MUSIC_INCLUDE@ @MPI_INCLUDE@ @GSL_CFLAGS@"
+        NEST_CFLAGS="-I${srcdir}/{libnestutil,librandom,sli,nestkernel,nest,topology} @MUSIC_INCLUDE@ @MPI_INCLUDE@ @GSL_CFLAGS@ @OPENMP_CXXFLAGS@"
         if [ "${builddir}" != "${srcdir}" ]; then
             NEST_CFLAGS="-I${builddir}/libnestutil ${NEST_CFLAGS}"
         fi
         echo $NEST_CFLAGS
         ;;
 
     --libs)
-        NEST_LDFLAGS="-l{model,precise}module -l{nest,random,sli} @SLI_LIBS@ @GSL_LIBS@ @MUSIC_LIBS@ @MPI_LIBS@ -lpthread -export-dynamic"
+        NEST_LDFLAGS="-l{models,precise,topology}module -l{nest,random,sli} @SLI_LIBS@ @GSL_LIBS@ @MUSIC_LIBS@ @MPI_LIBS@ -lpthread @OPENMP_CXXFLAGS@ -export-dynamic"
         if [ "${builddir}" != "${srcdir}" ]; then
-            NEST_LDFLAGS="-L${builddir}/{nestkernel,models,precise,librandom,sli}/.libs ${NEST_LDFLAGS}"
+            NEST_LDFLAGS="-L${builddir}/{nestkernel,models,precise,librandom,sli,topology}/.libs ${NEST_LDFLAGS}"
         else
-            NEST_LDFLAGS="-L${srcdir}/{nestkernel,models,precise,librandom,sli}/.libs ${NEST_LDFLAGS}"
+            NEST_LDFLAGS="-L${srcdir}/{nestkernel,models,precise,librandom,sli,topology}/.libs ${NEST_LDFLAGS}"
         fi
         echo $NEST_LDFLAGS
         ;;

lib/sli/nest-init.sli

@@ -33,12 +33,12 @@
 M_DEBUG (nest-init.sli) (Initializing SLI support for NEST Kernel.) message
 % see nestmodule.cpp
 
-/nest-init /SLI ($Revision: 10101 $) provide-component
+/nest-init /SLI ($Revision: 10474 $) provide-component
 /nest-init /C++ (1.157) require-component
 
 statusdict begin
 /kernellibrevision
-  ($Revision: 10101 $) % SVN/CVS revision number (unique)
+  ($Revision: 10474 $) % SVN/CVS revision number (unique)
 def
 end
 
@@ -299,7 +299,28 @@ def
 
    SeeAlso: DataConnect, SetSynapseStatus, GetSynapseStatus, synapsedict
 */
-/GetConnections [/dictionarytype] { GetConnections_D Flatten } def
+/GetConnections [/dictionarytype] 
+{ 
+  dup /pdict Set
+  [ /source /target ]
+  {
+    /key Set
+    pdict key known 
+    { 
+      pdict key get 
+      ArrayQ exch ; not  
+      {
+	key cvs ( argument must be list of GIDs) join M_ERROR message
+	/GetConnections /ArgumentError raiseerror
+      }
+      if
+    } if    
+  } forall
+  pstack
+  GetConnections_D 
+  Flatten 
+} def
+
 
 /* BeginDocumentation
    Name: GetSynapseStatus - Return synapse status information
@@ -351,7 +372,7 @@ def
      Name: DataConnect - Connect many neurons from data.
 
      Synopsis: 
-     1.   source dict model  DataConnect_i_dict_a -> -
+     1.   source dict model  DataConnect_i_D_a -> -
 
      source - GID of the source neuron
      dict   - dictionary with connection parameters
@@ -396,12 +417,12 @@ def
 
      Author: Marc-Oliver Gewaltig
      FirstVersion: August 2011
-     SeeAlso: DataConnect_i_dict_s, DataConnect_a, Connect, DivergentConnect
+     SeeAlso: DataConnect_i_D_s, DataConnect_a, Connect, DivergentConnect
   */ 
 
 /DataConnect trie
-  [/integertype /dictionarytype /literaltype] /DataConnect_i_dict_s load addtotrie
-  [/integertype /dictionarytype /stringtype] /DataConnect_i_dict_s load addtotrie
+  [/integertype /dictionarytype /literaltype] /DataConnect_i_D_s load addtotrie
+  [/integertype /dictionarytype /stringtype] /DataConnect_i_D_s load addtotrie
   [/arraytype] /DataConnect_a load addtotrie 
 def
 

lib/sli/typeinit.sli

@@ -864,18 +864,49 @@ BeginDocumentation
 
 */
 
+/trieheads_iter
+{
+ dup length 3 eq
+ {
+  dup First exch
+  Last
+  trieheads_iter
+  exch prepend
+ }
+ {
+  First [] exch append
+ }
+ ifelse 
+} def
+
+
+% trie trieheads
+/trieheads
+{
+ cva trieheads_iter
+} def
+
+
+% MemberQ
+% type trie triematches -> true, false
+/triematches
+{
+ trieheads
+ exch MemberQ 
+} def
 
 
 /cva trie
 [/dictionarytype] /cva_d load addtotrie
-[/trietype] /cva_t load addtotrie
+[/trietype] {cva_t exch pop} addtotrie
 [/arraytypetype] {} addtotrie
 [/intvectortype] /intvector2array load addtotrie
 [/doublevectortype] /doublevector2array load addtotrie
-[/arraytype] { {cva} Map } addtotrie
+[/arraytype] { {dup type /cva load triematches {cva} if} Map } addtotrie
 [/iteratortype] { {} Map } addtotrie
 def
 
+
 %%%%%%
 % commands "keys" and "values" implemented and documented
 % in slidict.{cc,h}: