Egalware/Extern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extern :

Browse Source 
- aggiornamento Vroni a 7.8.
This commit is contained in:
SaraP
2025-01-29 16:25:40 +01:00
parent 16a454c806
commit 7cb5ebab3f
33 changed files with 58 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vroni/Include/approx.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2003--2023 M. Held */
/* Copyright (C) 2003--2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/arc_common.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2007-2023 M. Held, S. Huber */
/* Copyright (C) 2007-2025 M. Held, S. Huber */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/basic.h
-117
View File
@@ -1,117 +0,0 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
/* the "main" file of this code, such as "main.c". */
/* */
/*****************************************************************************/
/* */
/* Written by: Martin Held */
/* */
/* E-Mail: held@cs.sbg.ac.at */
/* Fax Mail: (+43 662) 8044-611 */
/* Voice Mail: (+43 662) 8044-6304 */
/* Snail Mail: Martin Held */
/* FB Informatik */
/* Universitaet Salzburg */
/* A-5020 Salzburg, Austria */
/* */
/*****************************************************************************/
#ifndef VRONI_BASIC_H
#define VRONI_BASIC_H
#include "consts.h"
#include "util.h"
#include "types.h"
#define BASIC_MINI 1.0e-20
#ifndef RAND
#define RND_MAX 2147483647
#define UniformRandom(x) \
{\
x = ((double) random()) / RND_MAX; }
#define RandomInteger(N) \
(\
assert(N > 0), \
basic_i_local = random(), \
basic_i_local - (basic_i_local / (N)) * (N))
#define InitRandom(seed) \
{\
srandom(seed); }
#else
#ifdef RAND_MAX
#define RND_MAX RAND_MAX
#else
#define RND_MAX 32767
#endif
#define UniformRandom(x) \
{\
x = ((double) rand()) / RND_MAX; \
}
#define RandomInteger(N) \
(\
assert(N > 0), \
basic_i_local = rand(), \
basic_i_local - (basic_i_local / (N)) * (N))
#define InitRandom(seed) \
{\
srand(seed); }
#endif
/*
#define ScaleX(xc) (scale_factor * (xc - shift.x))
#define ScaleY(yc) (scale_factor * (yc - shift.y))
#define ScaleV(value) (value * scale_factor)
#define UnscaleX(xc) (assert(scale_factor > 0.0), xc / scale_factor + shift.x)
#define UnscaleY(yc) (assert(scale_factor > 0.0), yc / scale_factor + shift.y)
#define UnscaleV(value) (assert(scale_factor > 0.0), value / scale_factor)
*/
#define CirBBox(p, r, bb_min, bb_max) {\
(bb_min).x = (p).x - r; \
(bb_min).y = (p).y - r; \
(bb_max).x = (p).x + r; \
(bb_max).y = (p).y + r; }
#define TriBBox(a, b, c, bb_min, bb_max) {\
MinMax3((a).x, (b).x, (c).x, (bb_min).x, (bb_max).x); \
MinMax3((a).y, (b).y, (c).y, (bb_min).y, (bb_max).y); }
#endif
vroni/Include/consts.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2010-2023 M. Held, S. Huber */
/* Copyright (C) 2010-2025 M. Held, S. Huber */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/coord.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2010-2023 M. Held, S. Huber */
/* Copyright (C) 2010-2025 M. Held, S. Huber */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/coreatan2.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/defs.h
+3 -3
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
@@ -26,8 +26,8 @@
#include "mydefs.h"
#define PROG_NAME "V R O N I"
#define PROG_VERSION "7.7"
#define PROG_YEAR "1999-2024"
#define PROG_VERSION "7.8"
#define PROG_YEAR "1999-2025"
/* */
/* get the definitions for "exterior applications" */
vroni/Include/ext_appl_defs.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2002--2023 M. Held */
/* Copyright (C) 2002--2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/ext_appl_inout.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2003--2023 M. Held */
/* Copyright (C) 2003--2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/ext_appl_vroni_object.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2002--2023 M. Held */
/* Copyright (C) 2002--2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/fpkernel.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/geom.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2010-2023 M. Held, S. Huber */
/* Copyright (C) 2010-2025 M. Held, S. Huber */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/header.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/intersections.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/io_dxf.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2003--2023 M. Held */
/* Copyright (C) 2003--2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/ipe_io.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1996-2023 M. Held */
/* Copyright (C) 1996-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/numerics.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/offset.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/random.h
+22 -23
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
@@ -23,42 +23,41 @@
#ifndef VRONI_RANDOM_H
#define VRONI_RANDOM_H
#include "defs.h"
#ifndef RAND
#define RND_MAX 2147483647
#ifdef RANDOM_R
#define UniformRandom(x) \
#define RandomInteger(N, result) \
{\
x = ((double) random()) / RND_MAX; }
assert(N > 0); \
random_r(rdata, &result); \
result = result % N;}
#define InitRandom(seed) \
{\
rdata = (random_data*) calloc(1,sizeof(struct random_data)); \
initstate_r(seed, statebuf, 8, rdata); }
#define RandomInteger(N) \
(\
assert(N > 0), \
random() % N)
#else
#define RandomInteger(N, result) \
{\
assert(N > 0); \
result = random() % N;}
#define InitRandom(seed) \
{\
srandom(seed); }
#else
#ifdef RAND_MAX
#define RND_MAX RAND_MAX
#else
#define RND_MAX 32767
#endif
#define UniformRandom(x) \
{\
x = ((double) rand()) / RND_MAX; \
}
#else
#define RandomInteger(N) \
(\
assert(N > 0), \
rand() % N)
#define RandomInteger(N, result) \
{\
assert(N > 0); \
result = rand() % N;}
#define InitRandom(seed) \
{\
vroni/Include/roots.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/stack.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2000-2023 M. Held */
/* Copyright (C) 2000-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/types.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2001-2023 M. Held */
/* Copyright (C) 2001-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/util.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2010-2023 M. Held, S. Huber */
/* Copyright (C) 2010-2025 M. Held, S. Huber */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/vd_data.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2001-2023 M. Held */
/* Copyright (C) 2001-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/vddata.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2010-2023 M. Held, S. Huber */
/* Copyright (C) 2010-2025 M. Held, S. Huber */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/vroni_object.h
+9 -6
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
@@ -76,7 +76,7 @@
/* from vd_basic.cc */
#define VRONI_MAXSOL 80
#define VRONI_MAXSOL 160
/* from header.h */
@@ -996,7 +996,7 @@ public:
int io_flag;
int inputprec;
int mpfr_prec;
int vr_seed;
int vr_seed{0};
double t_offset;
double d_offset;
@@ -1983,6 +1983,8 @@ public:
/* arc_arc_arc.cc: */
vr_bool CouldBeFine(double eps, coord c1, double rr1, coord c3, double rr3);
vr_bool ArcArcArcCntr(int i, int j, int k, int e, coord *cntr, double *r2,
vr_bool *problematic, int* site);
@@ -2545,6 +2547,10 @@ public:
int m_num_rnd_sites;
int m_max_num_rnd_sites;
int m_cur_rnd_sites;
#ifdef RANDOM_R
struct random_data *rdata;
char statebuf[8];
#endif
#endif
#ifdef FORCED
@@ -2930,9 +2936,6 @@ public:
double AbsPntLineDist(double_arg a, double_arg b, double_arg c,
const coord & p);
/** Compute a uniform distributed random point */
coord UniformRandomPoint();
vr_bool IsBetweenVoronoiNodes(int e, const coord & p, double eps);
vroni/Include/vronivector.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 1999-2023 M. Held */
/* Copyright (C) 1999-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Include/wmat.h
+1 -1
View File
@@ -1,6 +1,6 @@
/*****************************************************************************/
/* */
/* Copyright (C) 2001-2023 M. Held */
/* Copyright (C) 2001-2025 M. Held */
/* */
/* This code is not in the public domain. All rights reserved! Please make */
/* sure to read the full copyright statement contained in "README.txt" or in */
vroni/Lib/vroniD32.lib
BIN
View File
Binary file not shown.
vroni/Lib/vroniD32.pdb
BIN
View File
Binary file not shown.
vroni/Lib/vroniD64.lib
BIN
View File
Binary file not shown.
vroni/Lib/vroniR32.lib
BIN
View File
Binary file not shown.
vroni/Lib/vroniR64.lib
BIN
View File
Binary file not shown.