[med-svn] [cnrun] 21/25: WIP
andrei zavada
hmmr-guest at moszumanska.debian.org
Thu Nov 6 22:08:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository cnrun.
commit 76aa09113be458cd2bbef81ef951b4804c01d4b9
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Mon Oct 6 01:53:37 2014 +0300
WIP
---
upstream/src/libcn/Makefile.am | 2 --
upstream/src/libcn/hosted-neurons.cc | 1 -
upstream/src/libcn/hosted-synapses.cc | 1 -
upstream/src/libcn/model-cycle.cc | 20 -------------
upstream/src/libcn/param-unit-literals.hh | 34 ----------------------
upstream/src/libcn/standalone-neurons.cc | 3 +-
upstream/src/libcn/standalone-synapses.cc | 3 +-
upstream/src/libcn/types.hh | 12 ++++++++
upstream/src/libstilton/Makefile.am | 2 +-
.../src/libstilton/{libcommon.cc => libstilton.cc} | 0
10 files changed, 15 insertions(+), 63 deletions(-)
diff --git a/upstream/src/libcn/Makefile.am b/upstream/src/libcn/Makefile.am
index be7b986..15e8899 100644
--- a/upstream/src/libcn/Makefile.am
+++ b/upstream/src/libcn/Makefile.am
@@ -17,7 +17,6 @@ libcn_la_SOURCES = \
model-nmlio.cc \
sources.hh \
types.hh \
- param-unit-literals.hh \
mx-attr.hh \
base-unit.hh standalone-attr.hh hosted-attr.hh \
base-synapse.hh standalone-neurons.hh hosted-neurons.hh \
@@ -36,7 +35,6 @@ BUILT_SOURCES = \
forward-decls.hh.gch \
sources.hh.gch \
types.hh.gch \
- param-unit-literals.hh.gch \
mx-attr.hh.gch \
base-unit.hh.gch standalone-attr.hh.gch hosted-attr.hh.gch \
base-synapse.hh.gch standalone-neurons.hh.gch hosted-neurons.hh.gch \
diff --git a/upstream/src/libcn/hosted-neurons.cc b/upstream/src/libcn/hosted-neurons.cc
index bacf4c3..7c862bf 100644
--- a/upstream/src/libcn/hosted-neurons.cc
+++ b/upstream/src/libcn/hosted-neurons.cc
@@ -20,7 +20,6 @@
#include "libstilton/lang.hh"
-#include "param-unit-literals.hh"
#include "types.hh"
#include "model.hh"
diff --git a/upstream/src/libcn/hosted-synapses.cc b/upstream/src/libcn/hosted-synapses.cc
index 9cfbbf6..98b88ac 100644
--- a/upstream/src/libcn/hosted-synapses.cc
+++ b/upstream/src/libcn/hosted-synapses.cc
@@ -18,7 +18,6 @@
#include <iostream>
#include "hosted-synapses.hh"
-#include "param-unit-literals.hh"
#include "types.hh"
#include "model.hh"
diff --git a/upstream/src/libcn/model-cycle.cc b/upstream/src/libcn/model-cycle.cc
index 50c9de6..e75265e 100644
--- a/upstream/src/libcn/model-cycle.cc
+++ b/upstream/src/libcn/model-cycle.cc
@@ -13,7 +13,6 @@
# include "config.h"
#endif
-#include <csignal>
#include <ctime>
#include <cstdlib>
#include <iostream>
@@ -163,25 +162,11 @@ cycle()
// -------------- CModel::advance and dependents
-inline namespace {
-
-volatile sig_atomic_t chris_at_kbd;
-void
-ctrl_c_handler( int signum)
-{
- chris_at_kbd = true;
-}
-
-}
-
unsigned int
cnrun::CModel::
advance( const double dist, double * const cpu_time_used_p)
{
- chris_at_kbd = 0;
- signal( SIGINT, ctrl_c_handler);
-
if ( units.size() == 0 ) {
vp( 1, "Model is empty\n");
return 0;
@@ -201,7 +186,6 @@ advance( const double dist, double * const cpu_time_used_p)
return _do_advance_on_pure_ddtbound( dist, cpu_time_used_p);
unsigned int retval = _do_advance_on_mixed( dist, cpu_time_used_p);
- signal( SIGINT, SIG_IGN);
return retval;
}
@@ -260,10 +244,6 @@ prepare_advance()
// they, logically, have no inputs
#define _DO_ADVANCE_COMMON_INLOOP_BEGIN \
- if ( chris_at_kbd ) { \
- printf( "\nInterrupted\n"); \
- break; \
- } \
make_units_with_continuous_sources_apprise_from_sources(); \
{ \
auto I = regular_periods.begin(); \
diff --git a/upstream/src/libcn/param-unit-literals.hh b/upstream/src/libcn/param-unit-literals.hh
deleted file mode 100644
index af4c823..0000000
--- a/upstream/src/libcn/param-unit-literals.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * File name: libcn/param-units-literals.hh
- * Project: cnrun
- * Author: Andrei Zavada <johnhommer at gmail.com>
- * Initial version: 2009-04-11
- *
- * Purpose: Fancy unicode symbols for various measurement units.
- *
- * License: GPL
- */
-
-#ifndef CNRUN_LIBCN_PARAMUNITLITERALS_H_
-#define CNRUN_LIBCN_PARAMUNITLITERALS_H_
-
-#define __CN_PU_CONDUCTANCE "\316\274S/cm\302\262"
-#define __CN_PU_RESISTANCE "M\316\251"
-#define __CN_PU_POTENTIAL "mV"
-#define __CN_PU_VOLTAGE "mV"
-#define __CN_PU_CURRENT "nA"
-#define __CN_PU_CAPACITY_DENSITY "\316\274F/cm\302\262"
-#define __CN_PU_TIME "msec"
-#define __CN_PU_TIME_MSEC "msec"
-#define __CN_PU_RATE "1/msec"
-#define __CN_PU_FREQUENCY "Hz"
-#define __CN_PU_TIME_SEC "sec"
-
-#endif
-
-// Local Variables:
-// Mode: c++
-// indent-tabs-mode: nil
-// tab-width: 8
-// c-basic-offset: 8
-// End:
diff --git a/upstream/src/libcn/standalone-neurons.cc b/upstream/src/libcn/standalone-neurons.cc
index b2d3e49..ba45d45 100644
--- a/upstream/src/libcn/standalone-neurons.cc
+++ b/upstream/src/libcn/standalone-neurons.cc
@@ -17,10 +17,9 @@
#include <iostream>
-#include "standalone-neurons.hh"
-#include "param-unit-literals.hh"
#include "types.hh"
#include "model.hh"
+#include "standalone-neurons.hh"
diff --git a/upstream/src/libcn/standalone-synapses.cc b/upstream/src/libcn/standalone-synapses.cc
index 565a96c..e6385c0 100644
--- a/upstream/src/libcn/standalone-synapses.cc
+++ b/upstream/src/libcn/standalone-synapses.cc
@@ -16,10 +16,9 @@
#include <iostream>
-#include "param-unit-literals.hh"
-#include "standalone-synapses.hh"
#include "types.hh"
#include "model.hh"
+#include "standalone-synapses.hh"
cnrun::C_StandaloneSynapse::
diff --git a/upstream/src/libcn/types.hh b/upstream/src/libcn/types.hh
index 6518868..eab0c93 100644
--- a/upstream/src/libcn/types.hh
+++ b/upstream/src/libcn/types.hh
@@ -275,6 +275,18 @@ extern const double __CN_Params_SynapseMap[];
extern const char* const __CN_ParamNames_SynapseMap[];
extern const char* const __CN_ParamSyms_SynapseMap[];
+#define __CN_PU_CONDUCTANCE "\316\274S/cm\302\262"
+#define __CN_PU_RESISTANCE "M\316\251"
+#define __CN_PU_POTENTIAL "mV"
+#define __CN_PU_VOLTAGE "mV"
+#define __CN_PU_CURRENT "nA"
+#define __CN_PU_CAPACITY_DENSITY "\316\274F/cm\302\262"
+#define __CN_PU_TIME "msec"
+#define __CN_PU_TIME_MSEC "msec"
+#define __CN_PU_RATE "1/msec"
+#define __CN_PU_FREQUENCY "Hz"
+#define __CN_PU_TIME_SEC "sec"
+
}
#endif
diff --git a/upstream/src/libstilton/Makefile.am b/upstream/src/libstilton/Makefile.am
index 82a3a6a..fc167c1 100644
--- a/upstream/src/libstilton/Makefile.am
+++ b/upstream/src/libstilton/Makefile.am
@@ -7,7 +7,7 @@ libstilton_la_SOURCES = \
alg.hh \
containers.hh \
lang.hh \
- libcommon.cc \
+ libstilton.cc \
misc.hh
libstilton_la_LDFLAGS = \
diff --git a/upstream/src/libstilton/libcommon.cc b/upstream/src/libstilton/libstilton.cc
similarity index 100%
rename from upstream/src/libstilton/libcommon.cc
rename to upstream/src/libstilton/libstilton.cc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git
More information about the debian-med-commit
mailing list