Update of /cvsroot/playerstage/code/stage/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11475/src
Modified Files:
dijkstra.c dijkstra.h model_audio.c p_simulation.cc
Log Message:
fixed position interface
Index: dijkstra.c
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/dijkstra.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dijkstra.c 27 Jul 2006 02:33:02 -0000 1.1
--- dijkstra.c 7 Sep 2006 03:18:30 -0000 1.2
***************
*** 29,32 ****
--- 29,36 ----
#include "dijkstra.h"
+ GHashTable *dijkstra_adjacency;
+ GHashTable *dijkstra_previous;
+ GHashTable *dijkstra_d;
+
typedef struct {
int node;
Index: dijkstra.h
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/dijkstra.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dijkstra.h 27 Jul 2006 02:33:02 -0000 1.1
--- dijkstra.h 7 Sep 2006 03:18:30 -0000 1.2
***************
*** 4,11 ****
#include <glib.h>
- //void initialize_dijkstra_d (int u, GList *vs, GHashTable *d);
- //void find_shortest_paths (GHashTable* adjacency, GHashTable* d, GHashTable*
previous);
void dijkstra_init();
void dijkstra_destroy();
//void dijkstra_set_graph_size(int n);
//void dijkstra_remove_edges_from(int u);
--- 4,15 ----
#include <glib.h>
void dijkstra_init();
void dijkstra_destroy();
+ void dijkstra_insert_edge(int u, int v, double w, gboolean temp_edge);
+ void dijkstra_remove_temp_edges();
+ void dijkstra_run();
+
+ //void initialize_dijkstra_d (int u, GList *vs, GHashTable *d);
+ //void find_shortest_paths (GHashTable* adjacency, GHashTable* d, GHashTable*
previous);
//void dijkstra_set_graph_size(int n);
//void dijkstra_remove_edges_from(int u);
***************
*** 13,24 ****
//void dijkstra_remove_edges_gte(int u);
//void dijkstra_insert_edge(int u, int v, double w);
- void dijkstra_insert_edge(int u, int v, double w, gboolean temp_edge);
//void dijkstra_insert_tmp_edge(int u, int v, double w);
- void dijkstra_remove_temp_edges();
- void dijkstra_run();
-
- GHashTable *dijkstra_adjacency;
- GHashTable *dijkstra_previous;
- GHashTable *dijkstra_d;
#endif
--- 17,21 ----
Index: model_audio.c
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/model_audio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** model_audio.c 2 Aug 2006 20:51:27 -0000 1.5
--- model_audio.c 7 Sep 2006 03:18:30 -0000 1.6
***************
*** 50,53 ****
--- 50,58 ----
#include "dijkstra.h"
+ /* declared global in dijkstra.c */
+ extern GHashTable *dijkstra_adjacency;
+ extern GHashTable *dijkstra_previous;
+ extern GHashTable *dijkstra_d;
+
//#define DEBUG
Index: p_simulation.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_simulation.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** p_simulation.cc 27 Jul 2006 02:33:02 -0000 1.17
--- p_simulation.cc 7 Sep 2006 03:18:30 -0000 1.18
***************
*** 37,41 ****
- "laser_return" 0-2
- "gripper_return" 0-1
- - "audio_return" 0-1
- "ranger_return" 0-1
- "obstacle_return" 0-1
--- 37,40 ----
***************
*** 134,138 ****
// poke the P/S name into the window title bar
! if( StgDriver::world && StgDriver::world->win &&
StgDriver::world->win->frame )
{
char txt[128];
--- 133,137 ----
// poke the P/S name into the window title bar
! if( StgDriver::world && StgDriver::world->win )
{
char txt[128];
***************
*** 205,214 ****
// Is it a request to set a model's pose?
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
! PLAYER_SIMULATION_REQ_SET_PROPERTY_INT,
this->addr))
{
! player_simulation_property_int_req_t* req =
! (player_simulation_property_int_req_t*)data;
// look up the named model
--- 204,213 ----
// Is it a request to set a model's pose?
else if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
! PLAYER_SIMULATION_REQ_SET_PROPERTY,
this->addr))
{
! player_simulation_property_req_t* req =
! (player_simulation_property_req_t*)data;
// look up the named model
***************
*** 220,229 ****
int ack =
stg_model_set_property( mod,
! req->prop,
(void*)req->value );
this->driver->Publish(this->addr, resp_queue,
ack==0 ? PLAYER_MSGTYPE_RESP_ACK :
PLAYER_MSGTYPE_RESP_NACK,
! PLAYER_SIMULATION_REQ_SET_PROPERTY_INT);
return(0);
}
--- 219,228 ----
int ack =
stg_model_set_property( mod,
! req->property,
(void*)req->value );
this->driver->Publish(this->addr, resp_queue,
ack==0 ? PLAYER_MSGTYPE_RESP_ACK :
PLAYER_MSGTYPE_RESP_NACK,
! PLAYER_SIMULATION_REQ_SET_PROPERTY);
return(0);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
