- added Stack::numLayers()

- added test target

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@615 b431acfa-c32f-4a4a-93f1-934dc6c82436

Makefile

@@ -7,6 +7,8 @@ GPP_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(GPP_SRCS)))
 GCC_SRCS := noise.c
 GCC_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .c,.o,$(GCC_SRCS)))
 
+TEST_SRCS := source/main.cpp source/Rbm.cpp source/Layer.cpp source/Stack.cpp source/noise.c
+	
 CXXFLAGS += -std=c++11 -L juce/build/${CONFIG}
 CXXFLAGS_debug := ${CXXFLAGS} -O0 -g
 CXXFLAGS_release := ${CXXFLAGS} -O2
@@ -24,6 +26,7 @@ LIBS := -lstdc++ -lm -larmadillo -ljsoncpp -ljuce -lfreetype -lpthread -ldl -lrt
 DEFINES := -DARMA_OPENMP_THREADS=1
 	
 all: ${BUILD_DIR}/rbm.elf
+test: ${BUILD_DIR}/test.elf
 	
 ${GPP_OBJS}: $(BUILD_DIR)/%.o : source/%.cpp
 	mkdir -p $(dir $@)
@@ -36,6 +39,10 @@ ${GCC_OBJS}: $(BUILD_DIR)/%.o : source/%.c
 ${BUILD_DIR}/rbm.elf: ${GPP_OBJS} ${GCC_OBJS} juce/build/${CONFIG}/libjuce.a
 	gcc ${LFLAGS_${CONFIG}} ${GPP_OBJS} ${GCC_OBJS} ${LIBS} -o $@
 
+${BUILD_DIR}/test.elf: ${TEST_SRCS}
+	mkdir -p $(dir $@)
+	g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} -o $@ ${TEST_SRCS} -larmadillo -ljsoncpp
+
 juce/build/${CONFIG}/libjuce.a: 
 	make -C juce
 clean:

source/Stack.cpp

@@ -28,7 +28,18 @@ Stack::Stack(const Stack& orig)
 }
 
 Stack::~Stack()
+{ }
+
+size_t Stack::numLayers()
 {
+	size_t count = 0;
+	Layer *pLayer = m_pLayers;
+	while(pLayer)
+	{
+		count++;
+		pLayer = pLayer->upper;
+	}
+	return count;
 }
 
 void Stack::addLayer(Layer *pOtherLayer)

source/Stack.hpp

@@ -42,6 +42,9 @@ public:
 	{
 		std::cout << "Stack::batchchanged() called" << std::endl;
 	}
+	
+	size_t numLayers();
+	
 private:
 	const std::string &m_prjname;
 	Layer *m_pLayers;