changeset 1198:fa07a78b29f6

minor modif, change to makefile for repo opencv installation
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Sat, 08 Oct 2022 13:17:35 -0400
parents 0475b4cd0cfb
children 6a6a4d5958f7
files c/Makefile trafficintelligence/traffic_engineering.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/c/Makefile	Sun Jul 31 16:49:51 2022 +0200
+++ b/c/Makefile	Sat Oct 08 13:17:35 2022 -0400
@@ -25,16 +25,16 @@
 #LDFLAGS += -Wl,--as-needed -Wl,-Bdynamic,-lgcc_s,-Bstatic
 
 ifeq ($(UNAME), Linux)
-	INCLUDE+= -I/usr/local/include/opencv4
-	LIBS += -L/usr/local/lib
-	LINUX_BOOST_PREFIX = /usr/local
+	INCLUDE+= -I/usr/include/opencv4
+	LIBS += -L/usr/lib
+#	LINUX_BOOST_PREFIX = /usr/local
 	CFLAGS += -DLINUX
 	EXE_EXTENSION=''
 else ifeq ($(UNAME), Darwin)
 	OPENCV_HOME=/usr/local
 	INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv
 	LIBS += -L$(OPENCV_HOME)/lib
-	LINUX_BOOST_PREFIX = /usr/local
+#	LINUX_BOOST_PREFIX = /usr/local
 	CFLAGS += -DLINUX
 	EXE_EXTENSION=''
 else # windows
--- a/trafficintelligence/traffic_engineering.py	Sun Jul 31 16:49:51 2022 +0200
+++ b/trafficintelligence/traffic_engineering.py	Sat Oct 08 13:17:35 2022 -0400
@@ -187,7 +187,7 @@
     
     def v(self,k):
         from numpy import log
-        return self.vmax*(1-k/self.kj)
+        return self.vf*(1-k/self.kj)
 
         
 class GreenbergFD(FundamentalDiagram):