ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/objset.c

Comparing ray/src/common/objset.c (file contents):
Revision 2.5 by gregl, Wed Dec 3 11:14:00 1997 UTC vs.
Revision 2.16 by greg, Wed Feb 22 17:05:36 2006 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1986 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  objset.c - routines for maintaining object sets.
6		*
7	<	*      7/28/85
7	>	*  External symbols declared in object.h
8		*/
9
10	+	#include "copyright.h"
11	+
12		#include  "standard.h"
13
14		#include  "octree.h"
#	Line 17 | Line 16 | static char SCCSid[] = "$SunId$ LBL";
16		#include  "object.h"
17
18		#ifndef  OSTSIZ
19	<	#ifdef  BIGMEM
21	<	#define  OSTSIZ         262139          /* object table size (a prime!) */
22	<	#else
19	>	#ifdef  SMLMEM
20		#define  OSTSIZ         32749           /* object table size (a prime!) */
21	+	#else
22	+	#define  OSTSIZ         262139          /* object table size (a prime!) */
23		#endif
24		#endif
25
26		static OBJECT  *ostable[OSTSIZ];        /* the object set table */
27
28
29	+	void
30		insertelem(os, obj)             /* insert obj into os, no questions */
31		register OBJECT  *os;
32		OBJECT  obj;
#	Line 42 | Line 42 | OBJECT  obj;
42		}
43
44
45	+	void
46		deletelem(os, obj)              /* delete obj from os, no questions */
47		register OBJECT  *os;
48		OBJECT  obj;
#	Line 61 | Line 62 | OBJECT  obj;
62		}
63
64
65	+	int
66		inset(os, obj)                  /* determine if object is in set */
67		register OBJECT  *os;
68		OBJECT  obj;
#	Line 68 | Line 70 | OBJECT  obj;
70		int  upper, lower;
71		register int  cm, i;
72
73	+	if ((i = os[0]) <= 12) {        /* linear search algorithm */
74	+	cm = obj;
75	+	while (i-- > 0)
76	+	if (*++os == cm)
77	+	return(1);
78	+	return(0);
79	+	}
80		lower = 1;
81	<	upper = cm = os[0] + 1;
81	>	upper = cm = i + 1;
82		/* binary search algorithm */
83		while ((i = (lower + upper) >> 1) != cm) {
84		cm = obj - os[i];
#	Line 85 | Line 94 | OBJECT  obj;
94		}
95
96
97	+	int
98		setequal(os1, os2)              /* determine if two sets are equal */
99		register OBJECT  *os1, *os2;
100		{
#	Line 97 | Line 107 | register OBJECT  *os1, *os2;
107		}
108
109
110	+	void
111		setcopy(os1, os2)               /* copy object set os2 into os1 */
112		register OBJECT  *os1, *os2;
113		{
#	Line 123 | Line 134 | register OBJECT  *os;
134		}
135
136
137	+	void
138		setunion(osr, os1, os2)         /* osr = os1 Union os2 */
139		register OBJECT  *osr, *os1, *os2;
140		{
#	Line 142 | Line 154 | register OBJECT  *osr, *os1, *os2;
154		}
155
156
157	+	void
158		setintersect(osr, os1, os2)     /* osr = os1 Intersect os2 */
159		register OBJECT  *osr, *os1, *os2;
160		{
#	Line 196 | Line 209 | tryagain:
209		ot = oseti(i*OSTSIZ + osentry);
210		if (*os > 0)                    /* found it */
211		return(ot);
212	<	if (!isfull(ot))                /* entry overflow */
212	>	if (!isfull(ot)) {              /* entry overflow */
213		if (++ntries < OSTSIZ)
214		goto tryagain;
215		else
216		error(INTERNAL, "hash table overflow in fullnode");
217	+	}
218		/* remember position */
219		i = os - ostable[osentry];
220		os = ostable[osentry] = (OBJECT *)realloc(
221	<	(char *)ostable[osentry],
221	>	(void *)ostable[osentry],
222		(unsigned)(i+oset[0]+2)*sizeof(OBJECT));
223		if (os == NULL)
224		goto memerr;
#	Line 216 | Line 230 | tryagain:
230		return(ot);
231		memerr:
232		error(SYSTEM, "out of memory in fullnode");
233	+	return 0; /* pro forma return */
234		}
235
236
237	+	void
238		objset(oset, ot)                /* get object set for full node */
239		register OBJECT  *oset;
240		OCTREE  ot;
#	Line 228 | Line 244 | OCTREE  ot;
244
245		if (!isfull(ot))
246		goto noderr;
247	<	i = oseti(ot);
248	<	if ((os = ostable[i%OSTSIZ]) == NULL)
247	>	ot = oseti(ot);
248	>	if ((os = ostable[ot%OSTSIZ]) == NULL)
249		goto noderr;
250	<	for (i /= OSTSIZ; i--; os += *os + 1)
250	>	for (i = ot/OSTSIZ; i--; os += *os + 1)
251		if (*os <= 0)
252		goto noderr;
253		for (i = *os; i-- >= 0; )               /* copy set here */
#	Line 242 | Line 258 | noderr:
258		}
259
260
261	<	int
246	<	dosets(f)                               /* loop through all sets */
247	<	int     (*f)();
248	<	{
249	<	int  res = 0;
250	<	int  n;
251	<	register OBJECT  *os;
252	<
253	<	for (n = 0; n < OSTSIZ; n++) {
254	<	if ((os = ostable[n]) == NULL)
255	<	continue;
256	<	while (*os > 0) {
257	<	res += (*f)(os);
258	<	os += *os + 1;
259	<	}
260	<	}
261	<	return(res);
262	<	}
263	<
264	<
261	>	void
262		donesets()                      /* free ALL SETS in our table */
263		{
264		register int  n;
265
266		for (n = 0; n < OSTSIZ; n++)
267		if (ostable[n] != NULL) {
268	<	free((char *)ostable[n]);
268	>	free((void *)ostable[n]);
269		ostable[n] = NULL;
270		}
271		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)