Revision: 653
http://svn.sourceforge.net/magicmap/?rev=653&view=rev
Author: anweiss
Date: 2007-05-30 07:30:00 -0700 (Wed, 30 May 2007)
Log Message:
-----------
commented some unecessary ifs out
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-04-30 13:46:14 UTC (rev 652)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java 2007-05-30 14:30:00 UTC (rev 653)
@@ -113,12 +113,12 @@
findAccessPoints(ap1, ap2, same, diff);
// Kein gemeinsamer Access Point
- if (same.size() == 0) return 1000.0 * calibration;
+ //if (same.size() == 0) return 1000.0 * calibration;
- if (same.size() == 1) {
- if (diff.size() == 0) return 0.0;
- return 1000.0 * calibration;
- }
+// if (same.size() == 1) {
+// if (diff.size() == 0) return 1.0;
+// return 1000.0 * calibration;
+// }
// Basteln von Vektoren f\xFCr die Distance-Funktion
Iterator it = same.iterator();
@@ -174,7 +174,7 @@
// TODO: Logarithmische Skalierung
return Math.abs(MeasurementUtils.signalLevelToStrength(seer.getSignalLevelForAccessPoint(ap)))
* calibration;
- //return Math.abs(0.3 * Math.pow(10,(-0.026 * seer.getSignalLevelForAccessPoint(ap)))-0.5);
+// return Math.abs(0.3 * Math.pow(10,(-0.026 * seer.getSignalLevelForAccessPoint(ap)))-0.5);
} else
//Wir berechnen nur Abst\xE4nde zwischen APs, Clients und Referenzpunkten
return Double.POSITIVE_INFINITY;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
