[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery NeighborListC.nc, 1.14, 1.15 NeighborListM.nc, 1.29, 1.30 ClusteringI.nc, 1.6, NONE

Thu May 25 19:58:22 PDT 2006

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29615/contrib/wustl/apps/Agilla/components/ContextDiscovery

Modified Files:
	NeighborListC.nc NeighborListM.nc 
Removed Files:
	ClusteringI.nc 
Log Message:
Removed clustering components.

Index: NeighborListC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery/NeighborListC.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NeighborListC.nc	23 May 2006 21:05:59 -0000	1.14
--- NeighborListC.nc	26 May 2006 02:58:20 -0000	1.15
***************
*** 1,115 ****
! // $Id$
! 
! /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis
!  * By Chien-Liang Fok.
!  *
!  * Washington University states that Agilla is free software;
!  * you can redistribute it and/or modify it under the terms of
!  * the current version of the GNU Lesser General Public License
!  * as published by the Free Software Foundation.
!  *
!  * Agilla is distributed in the hope that it will be useful, but
!  * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR
!  * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
!  * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
!  *
!  * YOU UNDERSTAND THAT AGILLA IS PROVIDED "AS IS" FOR WHICH NO
!  * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO
!  * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF
!  * INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER
!  * PROPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS
!  * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS",
!  * OR OTHER HARMFUL CODE.
!  *
!  * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR
!  * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF
!  * INFORMATION GENERATED USING SOFTWARE. By using Agilla you agree to
!  * indemnify, defend, and hold harmless WU, its employees, officers and
!  * agents from any and all claims, costs, or liabilities, including
!  * attorneys fees and court costs at both the trial and appellate levels
!  * for any loss, damage, or injury caused by your actions or actions of
!  * your officers, servants, agents or third parties acting on behalf or
!  * under authorization from you, as a result of using Agilla.
!  *
!  * See the GNU Lesser General Public License for more details, which can
!  * be found here: http://www.gnu.org/copyleft/lesser.html
!  */
! 
! includes Agilla;
! includes Clustering;
! 
! configuration NeighborListC {
!   provides interface NeighborListI;
!   
!   #if ENABLE_CLUSTERING
!     provides interface ClusteringI;
!   #endif
! }
! implementation {
!   components Main;
!   components NeighborListM, AddressMgrC, LedsC;
!   components NetworkInterfaceProxy as Comm;
!   components RandomLFSR, TimerC, SimpleTime;
!   components LocationUtils, LocationMgrC, MessageBufferM;
!   
!   #if ENABLE_CLUSTERING
!     components ClusterheadDirectoryC;
!   #endif
! 
!   #if ENABLE_EXP_LOGGING
!     components ExpLoggerC;
!   #endif
! 
! 
!   Main.StdControl -> NeighborListM;
!   Main.StdControl -> SimpleTime;
!   Main.StdControl -> TimerC;
!   Main.StdControl -> MessageBufferM;
! 
!   NeighborListI = NeighborListM;
! 
!   #if ENABLE_CLUSTERING
!     ClusteringI = NeighborListM;
!     NeighborListM.CHDir -> ClusterheadDirectoryC;
!     NeighborListM.CHDirControl -> ClusterheadDirectoryC;
!   #endif
! 
!   NeighborListM.AddressMgrI -> AddressMgrC;
! 
!   NeighborListM.Random -> RandomLFSR;
! 
!   NeighborListM.Time -> SimpleTime;
!   NeighborListM.TimeUtil -> SimpleTime;
! 
!   NeighborListM.BeaconTimer -> TimerC.Timer[unique("Timer")];
!   NeighborListM.DisconnectTimer-> TimerC.Timer[unique("Timer")];
! 
!   NeighborListM.SendBeacon -> Comm.SendMsg[AM_AGILLABEACONMSG];
!   NeighborListM.RcvBeacon -> Comm.ReceiveMsg[AM_AGILLABEACONMSG];
! 
!   //Finder.SendBeaconBS -> Comm.SendMsg[AM_AGILLABEACONBSMSG];
!   //Finder.RcvBeaconBS -> Comm.ReceiveMsg[AM_AGILLABEACONBSMSG];
! 
!   NeighborListM.RcvGetNbrList -> Comm.ReceiveMsg[AM_AGILLAGETNBRMSG];
!   NeighborListM.SendGetNbrList -> Comm.SendMsg[AM_AGILLAGETNBRMSG];
! 
!   //NeighborListM.SendNbrListTimer -> TimerC.Timer[unique("Timer")];
!   NeighborListM.SendNbrList -> Comm.SendMsg[AM_AGILLANBRMSG];
!   NeighborListM.RcvNbrList  -> Comm.ReceiveMsg[AM_AGILLANBRMSG];
! 
!   NeighborListM.LocationMgrI -> LocationMgrC;
!   NeighborListM.LocationUtilI -> LocationUtils;
! 
!   NeighborListM.MessageBufferI -> MessageBufferM;
!   NeighborListM.Leds -> LedsC;
! 
!   #if DEBUG_CLUSTERING
!     //NeighborListM.SendClusterDebugMsg -> Comm.SendMsg[AM_AGILLACLUSTERDEBUGMSG];
!     //NeighborListM.RcvClusterDebugMsg -> Comm.ReceiveMsg[AM_AGILLACLUSTERDEBUGMSG];
!   #endif
! 
!   #if ENABLE_EXP_LOGGING
!     NeighborListM.ExpLoggerI -> ExpLoggerC;
!   #endif
! }
--- 1,96 ----
! // $Id$
! 
! /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis
!  * By Chien-Liang Fok.
!  *
!  * Washington University states that Agilla is free software;
!  * you can redistribute it and/or modify it under the terms of
!  * the current version of the GNU Lesser General Public License
!  * as published by the Free Software Foundation.
!  *
!  * Agilla is distributed in the hope that it will be useful, but
!  * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR
!  * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
!  * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
!  *
!  * YOU UNDERSTAND THAT AGILLA IS PROVIDED "AS IS" FOR WHICH NO
!  * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO
!  * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF
!  * INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER
!  * PROPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS
!  * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS",
!  * OR OTHER HARMFUL CODE.
!  *
!  * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR
!  * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF
!  * INFORMATION GENERATED USING SOFTWARE. By using Agilla you agree to
!  * indemnify, defend, and hold harmless WU, its employees, officers and
!  * agents from any and all claims, costs, or liabilities, including
!  * attorneys fees and court costs at both the trial and appellate levels
!  * for any loss, damage, or injury caused by your actions or actions of
!  * your officers, servants, agents or third parties acting on behalf or
!  * under authorization from you, as a result of using Agilla.
!  *
!  * See the GNU Lesser General Public License for more details, which can
!  * be found here: http://www.gnu.org/copyleft/lesser.html
!  */
! 
! includes Agilla;
! includes Clustering;
! 
! configuration NeighborListC {
!   provides interface NeighborListI;
! }
! implementation {
!   components Main;
!   components NeighborListM, AddressMgrC, LedsC;
!   components NetworkInterfaceProxy as Comm;
!   components RandomLFSR, TimerC, SimpleTime;
!   components LocationUtils, LocationMgrC, MessageBufferM;
! 
!   #if ENABLE_EXP_LOGGING
!     components ExpLoggerC;
!   #endif
! 
! 
!   Main.StdControl -> NeighborListM;
!   Main.StdControl -> SimpleTime;
!   Main.StdControl -> TimerC;
!   Main.StdControl -> MessageBufferM;
! 
!   NeighborListI = NeighborListM;
! 
!   NeighborListM.AddressMgrI -> AddressMgrC;
! 
!   NeighborListM.Random -> RandomLFSR;
! 
!   NeighborListM.Time -> SimpleTime;
!   NeighborListM.TimeUtil -> SimpleTime;
! 
!   NeighborListM.BeaconTimer -> TimerC.Timer[unique("Timer")];
!   NeighborListM.DisconnectTimer-> TimerC.Timer[unique("Timer")];
! 
!   NeighborListM.SendBeacon -> Comm.SendMsg[AM_AGILLABEACONMSG];
!   NeighborListM.RcvBeacon -> Comm.ReceiveMsg[AM_AGILLABEACONMSG];
! 
!   //Finder.SendBeaconBS -> Comm.SendMsg[AM_AGILLABEACONBSMSG];
!   //Finder.RcvBeaconBS -> Comm.ReceiveMsg[AM_AGILLABEACONBSMSG];
! 
!   NeighborListM.RcvGetNbrList -> Comm.ReceiveMsg[AM_AGILLAGETNBRMSG];
!   NeighborListM.SendGetNbrList -> Comm.SendMsg[AM_AGILLAGETNBRMSG];
! 
!   //NeighborListM.SendNbrListTimer -> TimerC.Timer[unique("Timer")];
!   NeighborListM.SendNbrList -> Comm.SendMsg[AM_AGILLANBRMSG];
!   NeighborListM.RcvNbrList  -> Comm.ReceiveMsg[AM_AGILLANBRMSG];
! 
!   NeighborListM.LocationMgrI -> LocationMgrC;
!   NeighborListM.LocationUtilI -> LocationUtils;
! 
!   NeighborListM.MessageBufferI -> MessageBufferM;
!   NeighborListM.Leds -> LedsC;
! 
!   #if ENABLE_EXP_LOGGING
!     NeighborListM.ExpLoggerI -> ExpLoggerC;
!   #endif
! }

Index: NeighborListM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/ContextDiscovery/NeighborListM.nc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** NeighborListM.nc	23 May 2006 21:05:59 -0000	1.29
--- NeighborListM.nc	26 May 2006 02:58:20 -0000	1.30
***************
*** 1,1132 ****
! // $Id$
! 
! /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis
!  * By Chien-Liang Fok.
!  *
!  * Washington University states that Agilla is free software;
!  * you can redistribute it and/or modify it under the terms of
!  * the current version of the GNU Lesser General Public License
!  * as published by the Free Software Foundation.
[...1810 lines suppressed...]
!         for (i = 1; i < numNbrs; i++)
!         {
!           uint16_t d = dist(*nbr, nbrs[i].addr);
! 
!           #ifdef DEBUG_NEIGHBORLIST
!             dbg(DBG_USR1, "NeighborListI: GetClosestNeighbor: Checking neighbor %i (dist = %i)...\n", nbrs[i].addr, d);
!           #endif
! 
!           if (d < cDist)
!           {
!             cDist = d;
!             cPos = i;
!           }
!         }
!         *nbr = nbrs[cPos].addr;
!         return SUCCESS;
!       }
!     }
!   #endif /* ENABLE_GRID_ROUTING */
! }

--- ClusteringI.nc DELETED ---