[brlcad-commits] SF.net SVN: brlcad:[32616] brlcad/trunk/TODO
Revision: 32616 http://brlcad.svn.sourceforge.net/brlcad/?rev=32616&view=rev Author: brlcad Date: 2008-09-10 01:35:57 + (Wed, 10 Sep 2008) Log Message: --- looks like the DSP needs some tess() loving.. apparently never implemented Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2008-09-10 01:04:15 UTC (rev 32615) +++ brlcad/trunk/TODO 2008-09-10 01:35:57 UTC (rev 32616) @@ -296,6 +296,8 @@ a binunif. allocating 160 times binunif size is a bit extravagant (which comes from sizeof(struct dsp_bb)). +* implement tess() for the DSP primitive + * add dynamic geometry support. i.e. the ability to modify the parsed in-memory geometry tree on the fly via api calls (e.g. to add holes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32615] brlcad/trunk/src/adrt
Revision: 32615
http://brlcad.svn.sourceforge.net/brlcad/?rev=32615&view=rev
Author: brlcad
Date: 2008-09-10 01:04:15 + (Wed, 10 Sep 2008)
Log Message:
---
two more C-style comments and a lotta cuddle bracing
Modified Paths:
--
brlcad/trunk/src/adrt/libtienet/tienet_master.c
brlcad/trunk/src/adrt/libtienet/tienet_slave.c
brlcad/trunk/src/adrt/libtienet/tienet_util.c
brlcad/trunk/src/adrt/slave/load.c
brlcad/trunk/src/adrt/slave/main.c
brlcad/trunk/src/adrt/slave/slave.c
Modified: brlcad/trunk/src/adrt/libtienet/tienet_master.c
===
--- brlcad/trunk/src/adrt/libtienet/tienet_master.c 2008-09-09 18:56:27 UTC
(rev 32614)
+++ brlcad/trunk/src/adrt/libtienet/tienet_master.c 2008-09-10 01:04:15 UTC
(rev 32615)
@@ -165,8 +165,7 @@
tienet_sem_init(&tienet_master_sem_read, 0);
/* Allow the application to fill the buffer with tienet_master_buffer_size
*/
-for (i = 0; i < tienet_master_buffer_size; i++)
-{
+for (i = 0; i < tienet_master_buffer_size; i++) {
tienet_master_buffer[i].data = NULL;
tienet_master_buffer[i].size = 0;
tienet_sem_post(&tienet_master_sem_fill);
@@ -220,8 +219,7 @@
tienet_sem_wait(&tienet_master_sem_fill);
/* Fill buffer, Grow if necessary */
-if (sizeof(short) + sizeof(int) + size >
tienet_master_buffer[tienet_master_pos_fill].size)
-{
+if (sizeof(short) + sizeof(int) + size >
tienet_master_buffer[tienet_master_pos_fill].size) {
tienet_master_buffer[tienet_master_pos_fill].size = sizeof(short) +
sizeof(int) + size;
tienet_master_buffer[tienet_master_pos_fill].data =
bu_realloc(tienet_master_buffer[tienet_master_pos_fill].data,
tienet_master_buffer[tienet_master_pos_fill].size, "master buffer data");
}
@@ -234,14 +232,12 @@
tienet_sem_post(&tienet_master_sem_read);
/* Process items in tienet_master_DeadSocketList */
-for (socket = tienet_master_dead_socket_list; socket;)
-{
+for (socket = tienet_master_dead_socket_list; socket;) {
tienet_sem_wait(&tienet_master_sem_fill);
TCOPY(int, &(socket->work.size), 0, &size, 0);
/* Fill buffer, Grow if necessary */
- if (sizeof(short) + sizeof(int) + size >
tienet_master_buffer[tienet_master_pos_fill].size)
- {
+ if (sizeof(short) + sizeof(int) + size >
tienet_master_buffer[tienet_master_pos_fill].size) {
tienet_master_buffer[tienet_master_pos_fill].size = sizeof(short) +
sizeof(int) + size;
tienet_master_buffer[tienet_master_pos_fill].data =
bu_realloc(tienet_master_buffer[tienet_master_pos_fill].data,
tienet_master_buffer[tienet_master_pos_fill].size, "master buffer data");
}
@@ -267,8 +263,7 @@
* This is the case where slaves have exhausted the work buffer,
* then new work becomes available.
*/
-for (socket = tienet_master_socket_list; socket; socket = socket->next)
-{
+for (socket = tienet_master_socket_list; socket; socket = socket->next) {
/* Only if not master socket do we send data to slave */
if (socket->next && socket->idle)
tienet_master_send_work(socket);
@@ -309,28 +304,21 @@
fh = fopen(tienet_master_list, "rb");
-if (fh)
-{
- while (!feof(fh))
- {
+if (fh) {
+ while (!feof(fh)) {
bu_fgets(host, 64, fh);
- if (host[0])
- {
+ if (host[0]) {
port = TN_SLAVE_PORT;
temp = strchr(host, ':');
- if (temp)
- {
+ if (temp) {
port = atoi(&temp[1]);
temp[0] = 0;
- }
- else
- {
+ } else {
host[strlen(host)-1] = 0;
}
/* check to see if this slave is in dns */
- if (gethostbyname(host))
- {
+ if (gethostbyname(host)) {
slave_ent = gethostbyname(host)[0];
/* This is what we're connecting to */
@@ -340,8 +328,7 @@
/* Make a communications socket that will get stuffed into
the list */
daemon_socket = socket(AF_INET, SOCK_STREAM, 0);
- if (daemon_socket < 0)
- {
+ if (daemon_socket < 0) {
fprintf(stderr, "unable to create socket, exiting.\n");
exit(1);
}
@@ -350,32 +337,25 @@
daemon.sin_addr.s_addr = htonl(INADDR_ANY);
daemon.sin_port = htons(0);
- if (bind(daemon_socket, (struct sockaddr *)&daemon,
sizeof(daemon)) < 0)
- {
+ if (bind(daemon_socket, (struct sockaddr *)&daemon,
sizeof(daemon)) < 0) {
fpr
[brlcad-commits] SF.net SVN: brlcad:[32614] brlcad/trunk/src/adrt/libtienet/tienet_slave.c
Revision: 32614
http://brlcad.svn.sourceforge.net/brlcad/?rev=32614&view=rev
Author: erikgreenwald
Date: 2008-09-09 18:56:27 + (Tue, 09 Sep 2008)
Log Message:
---
C style comments
Modified Paths:
--
brlcad/trunk/src/adrt/libtienet/tienet_slave.c
Modified: brlcad/trunk/src/adrt/libtienet/tienet_slave.c
===
--- brlcad/trunk/src/adrt/libtienet/tienet_slave.c 2008-09-09 18:55:32 UTC
(rev 32613)
+++ brlcad/trunk/src/adrt/libtienet/tienet_slave.c 2008-09-09 18:56:27 UTC
(rev 32614)
@@ -152,8 +152,10 @@
return;
/* Request Work Unit */
-// op = TN_OP_REQWORK;
-// tienet_send(slave_socket, &op, sizeof(short));
+/*
+op = TN_OP_REQWORK;
+tienet_send(slave_socket, &op, sizeof(short));
+*/
while (1) {
tienet_recv(slave_socket, &op, sizeof(short));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32613] brlcad/trunk/src/adrt/slave/load.c
Revision: 32613
http://brlcad.svn.sourceforge.net/brlcad/?rev=32613&view=rev
Author: erikgreenwald
Date: 2008-09-09 18:55:32 + (Tue, 09 Sep 2008)
Log Message:
---
improved error checking. Match ISST request protocol.
Modified Paths:
--
brlcad/trunk/src/adrt/slave/load.c
Modified: brlcad/trunk/src/adrt/slave/load.c
===
--- brlcad/trunk/src/adrt/slave/load.c 2008-09-09 17:56:52 UTC (rev 32612)
+++ brlcad/trunk/src/adrt/slave/load.c 2008-09-09 18:55:32 UTC (rev 32613)
@@ -84,13 +84,21 @@
mysql_init (&slave_load_mysql_db);
/* establish connection to database */
-mysql_real_connect (&slave_load_mysql_db, hostname, ADRT_MYSQL_USER,
ADRT_MYSQL_PASS, ADRT_MYSQL_DB, 0, 0, 0);
+if ( mysql_real_connect (&slave_load_mysql_db, hostname, ADRT_MYSQL_USER,
ADRT_MYSQL_PASS, ADRT_MYSQL_DB, 0, 0, 0) == NULL ) {
+ printf("Unable to connect to db: %s\n",
mysql_error(&slave_load_mysql_db));
+ return -1;
+}
+
/* Obtain the geometry id for this project id */
sprintf (query, "select gid from project where pid = '%d'", pid);
mysql_query (&slave_load_mysql_db, query);
res = mysql_use_result (&slave_load_mysql_db);
+if(res == NULL) {
+ printf("Unable to get gid... \"%s\"\n", query);
+ return -1;
+}
row = mysql_fetch_row (res);
gid = atoi (row[0]);
mysql_free_result (res);
@@ -234,12 +242,13 @@
int
slave_load (tie_t *tie, struct adrt_load_info *li, uint32_t dlen)
{
+void *data = (void *)li;
TIE_VAL(tie_check_degenerate) = 0;
-switch(li->fmt) {
+switch( *(char *)data) {
#if HAVE_MYSQL
- case 0x0: /* mysql float */
- return slave_load_MySQL ( li->pid, tie, li->dbnam );
+ case 0x64: /* mysql float */
+ return slave_load_MySQL ( *((uint32_t *)data + 1), tie, (char
*)data + 9);
#endif
default:
fprintf(stderr, "Unknown load format\n");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32612] brlcad/trunk/src/libged/adc.c
Revision: 32612
http://brlcad.svn.sourceforge.net/brlcad/?rev=32612&view=rev
Author: bob1961
Date: 2008-09-09 17:56:52 + (Tue, 09 Sep 2008)
Log Message:
---
Remove adc draw toggle.
Modified Paths:
--
brlcad/trunk/src/libged/adc.c
Modified: brlcad/trunk/src/libged/adc.c
===
--- brlcad/trunk/src/libged/adc.c 2008-09-09 17:20:53 UTC (rev 32611)
+++ brlcad/trunk/src/libged/adc.c 2008-09-09 17:56:52 UTC (rev 32612)
@@ -99,15 +99,6 @@
return BRLCAD_ERROR;
}
-if (argc == 1) {
- if (gedp->ged_gvp->gv_adc.gas_draw)
- gedp->ged_gvp->gv_adc.gas_draw = 0;
- else
- gedp->ged_gvp->gv_adc.gas_draw = 1;
-
- return BRLCAD_OK;
-}
-
command = (char *)argv[0];
if (strcmp(argv[1], "-i") == 0) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[32610] brlcad/trunk
Revision: 32610
http://brlcad.svn.sourceforge.net/brlcad/?rev=32610&view=rev
Author: bob1961
Date: 2008-09-09 12:43:17 + (Tue, 09 Sep 2008)
Log Message:
---
Added the following members to ged_view: gv_adc, gv_grid and gv_rect.
Modified Paths:
--
brlcad/trunk/include/ged.h
brlcad/trunk/include/tclcad.h
brlcad/trunk/src/libtclcad/ged_obj.c
Modified: brlcad/trunk/include/ged.h
===
--- brlcad/trunk/include/ged.h 2008-09-09 12:37:50 UTC (rev 32609)
+++ brlcad/trunk/include/ged.h 2008-09-09 12:43:17 UTC (rev 32610)
@@ -280,35 +280,38 @@
struct ged_view {
-struct bu_list l;
-fastf_tgv_scale;
-fastf_tgv_size;/**< @brief 2.0 * scale */
-fastf_tgv_isize; /**< @brief 1.0 / size */
-fastf_tgv_perspective; /**< @brief perspective angle
*/
-vect_t gv_aet;
-vect_t gv_eye_pos; /**< @brief eye position */
-vect_t gv_keypoint;
-char gv_coord; /**< @brief coordinate system
*/
-char gv_rotate_about;/**< @brief indicates what
point rotations are about */
-mat_t gv_rotation;
-mat_t gv_center;
-mat_t gv_model2view;
-mat_t gv_pmodel2view;
-mat_t gv_view2model;
-mat_t gv_pmat;/**< @brief perspective matrix
*/
+struct bu_list l;
+fastf_tgv_scale;
+fastf_tgv_size;/**< @brief 2.0 *
scale */
+fastf_tgv_isize; /**< @brief 1.0 / size
*/
+fastf_tgv_perspective; /**< @brief
perspective angle */
+vect_t gv_aet;
+vect_t gv_eye_pos; /**< @brief eye
position */
+vect_t gv_keypoint;
+char gv_coord; /**< @brief coordinate
system */
+char gv_rotate_about;/**< @brief indicates
what point rotations are about */
+mat_t gv_rotation;
+mat_t gv_center;
+mat_t gv_model2view;
+mat_t gv_pmodel2view;
+mat_t gv_view2model;
+mat_t gv_pmat;/**< @brief
perspective matrix */
#if 0
-struct bu_observer gv_observers;
-void (*gv_callback)(); /**< @brief called in
vo_update with gv_clientData and gvp */
-genptr_t gv_clientData; /**< @brief passed to
gv_callback */
+struct bu_observer gv_observers;
+void (*gv_callback)(); /**< @brief called in
vo_update with gv_clientData and gvp */
+genptr_t gv_clientData; /**< @brief passed to
gv_callback */
#endif
-intgv_zclip;
-fastf_tgv_prevMouseX;
-fastf_tgv_prevMouseY;
-fastf_tgv_minMouseDelta;
-fastf_tgv_maxMouseDelta;
-fastf_tgv_rscale;
-fastf_tgv_sscale;
-intgv_mode;
+intgv_zclip;
+fastf_tgv_prevMouseX;
+fastf_tgv_prevMouseY;
+fastf_tgv_minMouseDelta;
+fastf_tgv_maxMouseDelta;
+fastf_tgv_rscale;
+fastf_tgv_sscale;
+intgv_mode;
+struct ged_adc_state gv_adc;
+struct ged_grid_state gv_grid;
+struct ged_rect_state gv_rect;
};
Modified: brlcad/trunk/include/tclcad.h
===
--- brlcad/trunk/include/tclcad.h 2008-09-09 12:37:50 UTC (rev 32609)
+++ brlcad/trunk/include/tclcad.h 2008-09-09 12:43:17 UTC (rev 32610)
@@ -78,9 +78,6 @@
struct ged_view*gdv_view;
struct dm *gdv_dmp;
struct fbserv_obj gdv_fbs;
-struct ged_adc_state gdv_adc;
-struct ged_grid_state gdv_grid;
-struct ged_rect_state gdv_rect;
struct ged_obj *gdv_gop; /* Pointer back to its ged object */
};
Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===
--- brlcad/trunk/src/libtclcad/ged_obj.c2008-09-09 12:37:50 UTC (rev
32609)
+++ brlcad/trunk/src/libtclcad/ged_obj.c2008-09-09 12:43:17 UTC (rev
32610)
@@ -969,10 +969,10 @@
}
if (argc == 2) {
- if (gdvp->gdv_adc.gas_draw)
- gdvp->gdv_adc.gas_draw = 0;
+ if (
[brlcad-commits] SF.net SVN: brlcad:[32609] brlcad/trunk/src/libpc
Revision: 32609
http://brlcad.svn.sourceforge.net/brlcad/?rev=32609&view=rev
Author: homovulgaris
Date: 2008-09-09 12:37:50 + (Tue, 09 Sep 2008)
Log Message:
---
adding a compact display method (cdisplay()) to Solution object to display
ranges of multiple solutions (mostly for debugging)
Modified Paths:
--
brlcad/trunk/src/libpc/pcVariable.h
brlcad/trunk/src/libpc/solver_test.cpp
Modified: brlcad/trunk/src/libpc/pcVariable.h
===
--- brlcad/trunk/src/libpc/pcVariable.h 2008-09-09 12:21:23 UTC (rev 32608)
+++ brlcad/trunk/src/libpc/pcVariable.h 2008-09-09 12:37:50 UTC (rev 32609)
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include "pcBasic.h"
#include "pcInterval.h"
@@ -180,6 +181,7 @@
void insert(VariableAbstract * v);
void display();
+void cdisplay();
void clear();
bool addSolution(VarSet & V);
private:
@@ -556,6 +558,59 @@
std::cout << "Number of Solutions: " << Domset_.size() << std::endl;
}
+template
+void Solution::cdisplay()
+{
+if (Domset_.size() < 2)
+ display();
+else {
+ int l;
+ VarSet::iterator i;
+ typename DomSet::iterator j;
+typename Domains::iterator k;
+ std::vector minmax;
+
+std::cout << "Solution Ranges are shown due to existance of non-unique
solutions." << std::endl;
+ for (i = Varset_.begin(); i != Varset_.end(); i++) {
+ if (*i) std::cout << (*i)->getID() << "\t";
+ }
+std::cout << std::endl;
+
+ if (!Domset_.empty()) {
+ j = Domset_.begin();
+ for ( k = j->begin(), l=0; k != j->end(); ++k,++l) {
+ minmax.push_back(k->getFirst());
+ minmax.push_back(k->getFirst());
+ }
+
+ for (j = Domset_.begin(); j != Domset_.end(); ++j) {
+ for ( k = j->begin(), l = 0; k != j->end(); ++k,++l) {
+ T value = k->getFirst();
+ minmax[2*l] = (value < minmax[2*l])?value:minmax[2*l];
+ minmax[2*l+1] = (value > minmax[2*l])?value:minmax[2*l+1];
+ }
+ }
+ }
+for (l = 0; l < minmax.size()/2; ++l) {
+ std::cout << minmax[2*l] << "\t";
+}
+std::cout << std::endl;
+
+for (l = 0; l < minmax.size()/2; ++l) {
+ if ( minmax[2*l] != minmax[2*l+1])
+ std::cout << "to" << "\t";
+}
+std::cout << std::endl;
+
+for (l = 0; l < minmax.size()/2; ++l) {
+ if ( minmax[2*l] != minmax[2*l+1])
+ std::cout << minmax[2*l+1] << "\t";
+}
+
+std::cout << std::endl << "Number of Solutions: " << Domset_.size() <<
std::endl;
+}
+}
+
template
void Solution::clear()
{
Modified: brlcad/trunk/src/libpc/solver_test.cpp
===
--- brlcad/trunk/src/libpc/solver_test.cpp 2008-09-09 12:21:23 UTC (rev
32608)
+++ brlcad/trunk/src/libpc/solver_test.cpp 2008-09-09 12:37:50 UTC (rev
32609)
@@ -130,9 +130,9 @@
S1.clear();
GPCS.solve(vc_set,S1);
-std::cout << "\nSolution using Generic BackTracking Solver "
+std::cout << "\nSolution using Generic Solver "
<< GPCS.numChecks() << "\t" << GPCS.numSolutions() << std::endl;
-S1.display();
+S1.cdisplay();
pc_free_pcset(&pcs);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
