# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1665249455 14400
# Node ID fa07a78b29f64eda198a45d9b55204985fe587e1
# Parent  0475b4cd0cfba22d7da094ead0ff935d7fe40eb3
minor modif, change to makefile for repo opencv installation

diff -r 0475b4cd0cfb -r fa07a78b29f6 c/Makefile
--- 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
diff -r 0475b4cd0cfb -r fa07a78b29f6 trafficintelligence/traffic_engineering.py
--- 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):