[Magicmap-commits] SF.net SVN: magicmap: [681] trunk/magicmapclient/src/net/sf/magicmap/client

[<fle...@us...>]

Revision: 681
          http://magicmap.svn.sourceforge.net/magicmap/?rev=681&view=rev
Author:   flederohr
Date:     2007-10-25 06:11:26 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
fixed bug no. 1768459 : Alg: Misbehaviour of edge-length-calculation

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
    trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java	2007-10-25 10:29:38 UTC (rev 680)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java	2007-10-25 13:11:26 UTC (rev 681)
@@ -115,10 +115,10 @@
             // Kein gemeinsamer Access Point
             //if (same.size() == 0) return 1000.0 * calibration;
 
-//            if (same.size() == 1) {
-//                if (diff.size() == 0) return 1.0;
-//                return 1000.0 * calibration;
-//            }
+            if (same.size() == 1) {
+                // if (diff.size() == 0) return 1.0;
+                return 200.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;

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java	2007-10-25 10:29:38 UTC (rev 680)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/location/jung/MagicLengthFunction.java	2007-10-25 13:11:26 UTC (rev 681)
@@ -118,20 +118,18 @@
 
         if (clientOrLocation) {
             if (d < 0.95) {
-
                 LayoutSettings.adjustLocationCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
             } else if (d > 1.05) {
                 LayoutSettings.adjustLocationCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
-
             }
-
+            log.debug("Calibration Location: " + LayoutSettings.getCalibrationFactorLocation());
         } else {
             if (d < 0.95) {
                 LayoutSettings.adjustAccessPointCalibration(-Math.max(Math.abs(len - desiredLen) / 200, 0.001));
             } else if (d > 1.05) {
                 LayoutSettings.adjustAccessPointCalibration(Math.max(Math.abs(len - desiredLen) / 200, 0.001));
-
             }
+            log.debug("Calibration AccessPoint: " + LayoutSettings.getCalibrationFactorAccessPoint());
         }
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.