Fixes for windows

CINPLA · Apr 28, 2015 · 9509b32 · 9509b32
1 parent deb2a39
commit 9509b32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/qml/neurons/OldNeuron.qml b/qml/neurons/OldNeuron.qml
@@ -13,7 +13,7 @@ Node {
     property alias voltage: engine.voltage
     property real acceleration: 0.0
     property real speed: 0.0
-    property alias cm: engine.cm
+//    property alias cm: engine.cm
     //    property var outputNeurons: []
     property point connectionPoint: Qt.point(x + width / 2, y + height / 2)
     property alias synapticConductance: engine.synapticConductance

diff --git a/src/engine/receptivefield.cpp b/src/engine/receptivefield.cpp
@@ -2,6 +2,8 @@
 
 #include <cmath>
 
+const static long double pi = 3.141592653589793238462643383279502884L;
+
 ReceptiveField::ReceptiveField()
 {
 }
@@ -114,7 +116,7 @@ double ReceptiveField::gaborField(int idx, int idy)
     double x =  idx * cos(theta) + idy * sin(theta);
     double y = -idx * sin(theta) + idy * cos(theta);
 
-    double prefactor = 1.0/(2.* M_PI * sigmaX * sigmaY);
+    double prefactor = 1.0/(2.* pi * sigmaX * sigmaY);
     double expFactor = exp(-x*x/(2.* sigmaX * sigmaX) - y*y/(2. * sigmaY * sigmaY));
     double cosFactor = cos(k * x - phi);
     return prefactor * expFactor * cosFactor;