mirror
/
libdspl-2.0
kopia lustrzana https://github.com/Dsplib/libdspl-2.0
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Contour plot basic functions 

Changes to be committed:
	modified:   dspl/src/gnuplot/contour2d.c
	new file:   dspl/src/gnuplot/contour2d.h
	new file:   dspl/src/gnuplot/contour2d_free.c
	new file:   dspl/src/gnuplot/contour2d_krn.c
	modified:   examples/src/contour_test.c
	modified:   include/dspl.c
	modified:   include/dspl.h
master
Dsplib 2024-01-09 23:07:12 +03:00
rodzic 7773d2867d
commit fd13aa502c
7 zmienionych plików z 462 dodań i 362 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

389
dspl/src/gnuplot/contour2d.c
Wyświetl plik

@ -17,387 +17,60 @@
* You should have received a copy of the GNU General Public License
* along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "dspl.h"
#define BSIZE 256
#define DIST_TH 1E-8
typedef struct
{
point2d_t p[2];
int flag;
} linseg_t;
int add_linseg(linseg_t** ls, int* lsnum, int* lscnt,
point2d_t* p0, point2d_t* p1)
{
int n, c;
n = *lsnum;
c = *lscnt;
// проверяем выделение памяти.
if((n == 0) && ((*ls)==NULL))
{
n = BSIZE;
(*ls) = (linseg_t*)malloc(n * sizeof(linseg_t));
}
else
{
// при необходимости увеличиваем
if(c >= n)
{
n += BSIZE;
(*ls) = (linseg_t*)realloc((*ls), n * sizeof(linseg_t));
}
}
(*ls)[c].p[0][0] = p0[0][0];
(*ls)[c].p[0][1] = p0[0][1];
(*ls)[c].p[1][0] = p1[0][0];
(*ls)[c].p[1][1] = p1[0][1];
(*ls)[c].flag = 1;
c++;
(*lsnum) = n;
(*lscnt) = c;
return RES_OK;
}
int linseg_create(double* z, double* x, double* y,
int n, int m, double lev,
linseg_t** ls, int* sz)
{
int lsnum, lscnt, t, in, im, i;
point2d_t p0 = {0};
point2d_t p1 = {0};
double dx;
double dy;
if((ls== NULL)||(z==NULL))
return ERROR_PTR;
lsnum = 0;
lscnt = 0;
for(in = 0; in < n-1; in++)
{
for(im = 0; im < m-1; im++)
{
i = in + im * n;
t = 0;
t += z[i] > lev ? 8 : 0;
t += z[i+n] > lev ? 4 : 0;
t += z[i+n+1] > lev ? 2 : 0;
t += z[i+1] > lev ? 1 : 0;
printf("%d, %d, %d\n", in, im, t);
switch(t)
{
case 0:
case 15:
break;
case 1:
case 14:
dx = (lev - z[i]) / (z[i+1] - z[i]);
p0[0] = x[in] + dx;
p0[1] = y[im];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im] + dy;
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 2:
case 13:
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p0[0] = x[in] + dx;
p0[1] = y[im + 1];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in + 1];
p1[1] = y[im] + dy;
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 3:
case 12:
dx = (lev - z[i]) / (z[i+1] - z[i]);
p0[0] = x[in] + dx;
p0[1] = y[im];
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p1[0] = x[in] + dx;
p1[1] = y[im+1];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 4:
case 11:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy;
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p1[0] = x[in] + dx;
p1[1] = y[im + 1];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 5:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy;
dx = (lev - z[i]) / (z[i+1] - z[i]);
p1[0] = x[in] + dx;
p1[1] = y[im];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p0[0] = x[in]+dx;
p0[1] = y[im+1];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im] + dy;
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 6:
case 9:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy;
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im]+dy;
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 7:
case 8:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy;
dx = (lev - z[i]) / (z[i+1] - z[i]);
p1[0] = x[in] + dx;
p1[1] = y[im];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 10:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy;
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in] + dx;
p1[1] = y[im+1];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
dx = (lev - z[i]) / (z[i+1] - z[i]);
p0[0] = x[in]+dx;
p0[1] = y[im];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im] + dy;
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
default:
break;
}
}
}
*ls = (linseg_t*)realloc(*ls, lscnt * sizeof(linseg_t));
*sz = lscnt;
return RES_OK;
}
double dist(point2d_t* p0, point2d_t* p1)
{
double dx, dy;
dx = p0[0][0] - p1[0][0];
dy = p0[0][1] - p1[0][1];
return sqrt(dx*dx + dy*dy);
}
int line_create(linseg_t* ls, int nls, line2d_t* line)
{
int i, j, c, n, k;
if(!line || !ls)
return ERROR_PTR;
// printf("*line = %x, *np = %d \n", *line, *np);
i = 0;
while(!(ls[i].flag) && i < nls)
i++;
if(i==nls)
{
line->npoints = 0;
return RES_OK;
}
//printf("i = %d, ls[%d] = [%.1f %.1f] -- [%.1f, %.1f]\n",
// i, i, ls[i].p[0][0], ls[i].p[0][1],
// ls[i].p[1][0], ls[i].p[1][1]);
n = BSIZE;
if(line->points == NULL)
line->points = (point2d_t*)malloc(n*sizeof(point2d_t));
else
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
c = 0;
line->points[c][0] = ls[i].p[0][0];
line->points[c][1] = ls[i].p[0][1];
c++;
line->points[c][0] = ls[i].p[1][0];
line->points[c][1] = ls[i].p[1][1];
c++;
ls[i].flag = 0;
for(i = 0; i < nls; i++)
{
for(j = 0; j < nls; j++)
{
if(ls[j].flag)
{
//сравниваем последнюю точку линии с первой точкой отрезка ls[j]
if(dist(line->points+c-1, ls[j].p) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если первая точка отрезка совпадает, то добавляем
//в линию вторую точку СЗАДИ
line->points[c][0] = ls[j].p[1][0];
line->points[c][1] = ls[j].p[1][1];
ls[j].flag = 0;
c++;
}
}
if(ls[j].flag)
{
// сравниваем последнюю точку линии
// со второй точкой отрезка ls[j]
if(dist(line->points+c-1, ls[j].p+1) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если вторая точка совпадает, то добавляем
//в линию первую точку СЗАДИ
line->points[c][0] = ls[j].p[0][0];
line->points[c][1] = ls[j].p[0][1];
ls[j].flag = 0;
c++;
}
}
if(ls[j].flag)
{
//сравниваем последнюю точку линии с первой точкой отрезка ls[j]
if(dist(line->points, ls[j].p) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если первая точка отрезка совпадает, то добавляем
//в линию вторую точку СПЕРЕДИ
for(k = c; k>0; k--)
{
line->points[k][0] = line->points[k-1][0];
line->points[k][1] = line->points[k-1][1];
}
line->points[0][0] = ls[j].p[1][0];
line->points[0][1] = ls[j].p[1][1];
ls[j].flag = 0;
c++;
}
}
if(ls[j].flag)
{
// сравниваем последнюю точку линии
// со второй точкой отрезка ls[j]
if(dist(line->points, ls[j].p+1) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если вторая точка совпадает, то добавляем
//в линию первую точку СПЕРЕДИ
for(k = c; k>0; k--)
{
line->points[k][0] = line->points[k-1][0];
line->points[k][1] = line->points[k-1][1];
}
line->points[0][0] = ls[j].p[0][0];
line->points[0][1] = ls[j].p[0][1];
ls[j].flag = 0;
c++;
}
}
}
}
line->points = (point2d_t*)realloc(line->points, c*sizeof(point2d_t));
line->npoints = c;
return RES_OK;
}
#include "contour2d.h"
int DSPL_API contour2d(double* z, double* x, double* y,
int n, int m, double lev,
contour2d_t* c)
int n, int m, double lev,
contour2d_t* c)
{
linseg_t *ls = NULL;
int nls, i, j, nlines;
int nls, i;
// Создаем полный массив отезков
linseg_create(z, x, y, n, m, lev, &ls, &nls);
for(i =0; i< nls; i++)
printf("%d, [%.1f %.1f] -- [%.1f %.1f]\n", i, ls[i].p[0][0], ls[i].p[0][1], ls[i].p[1][0], ls[i].p[1][1]);
//for(i =0; i< nls; i++)
// printf("%d, [%.1f %.1f] -- [%.1f %.1f]\n", i, ls[i].p[0][0], ls[i].p[0][1], ls[i].p[1][0], ls[i].p[1][1]);
// очищаем контур при необходимости
contour2d_free(c);
// Создаем массив линий
if (c->lines == NULL)
{
nlines = BSIZE;
c->lines = (line2d_t*)malloc(nlines*sizeof(line2d_t));
c->nlines = BSIZE;
c->lines = (line2d_t*)malloc(c->nlines*sizeof(line2d_t));
memset(c->lines, 0, c->nlines*sizeof(line2d_t));
}
// Главный цикл. На каждой итерации создаем
// одну линию и добавляем ее в контур
i = -1;
do
{
i++;
if(i >= nlines)
// при необходимости увеличиваем размер массива
if(i >= c->nlines)
{
nlines+= BSIZE;
c->lines = (line2d_t*)realloc(c->lines, nlines*sizeof(line2d_t));
c->lines = (line2d_t*)realloc(c->lines, (c->nlines + BSIZE)*sizeof(line2d_t));
memset(c->lines + c->nlines, 0, BSIZE*sizeof(line2d_t));
c->nlines += BSIZE;
}
// создаем очередную линию путем стыковки отезков
line_create(ls, nls, c->lines+i);
for(j =0; j< c->lines[i].npoints; j++)
printf("[%.1f %.1f] -- ", c->lines[i].points[j][0], c->lines[i].points[j][1]);
printf("\n");
//for(j =0; j< c->lines[i].npoints; j++)
// printf("[%.1f %.1f] -- ", c->lines[i].points[j][0], c->lines[i].points[j][1]);
//printf("\n");
}while(c->lines[i].npoints);
c->lines = (line2d_t*)realloc(c->lines, i*sizeof(line2d_t));
c->nlines = i;
c->level = lev;

26
dspl/src/gnuplot/contour2d.h 100644
Wyświetl plik

@ -0,0 +1,26 @@
#ifndef CONTOUR2D_H
#define CONTOUR2D_H
#define BSIZE 256
#define DIST_TH 1E-8
typedef struct
{
point2d_t p[2];
int flag;
} linseg_t;
int add_linseg(linseg_t** ls, int* lsnum, int* lscnt,
point2d_t* p0, point2d_t* p1);
int linseg_create(double* z, double* x, double* y,
int n, int m, double lev,
linseg_t** ls, int* sz);
double dist(point2d_t* p0, point2d_t* p1);
int line_create(linseg_t* ls, int nls, line2d_t* line);
#endif

41
dspl/src/gnuplot/contour2d_free.c 100644
Wyświetl plik

@ -0,0 +1,41 @@
/*
* Copyright (c) 2015-2024 Sergey Bakhurin
* Digital Signal Processing Library [http://dsplib.org]
*
* This file is part of DSPL.
*
* is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* DSPL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Foobar. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "dspl.h"
void DSPL_API contour2d_free(contour2d_t* c)
{
int nl;
if(c->lines)
{
for (nl = 0; nl < c->nlines; nl++)
{
if(c->lines[nl].points)
free(c->lines[nl].points);
}
free(c->lines);
c->lines = NULL;
}
c->nlines = 0;
c->level = 0.0;
}

346
dspl/src/gnuplot/contour2d_krn.c 100644
Wyświetl plik

@ -0,0 +1,346 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "dspl.h"
#include "contour2d.h"
/*******************************************************************************
Добавляем отрезок в массив отрезков
*******************************************************************************/
int add_linseg(linseg_t** ls, int* lsnum, int* lscnt,
point2d_t* p0, point2d_t* p1)
{
int n, c;
n = *lsnum;
c = *lscnt;
// проверяем выделение памяти.
if((n == 0) && ((*ls)==NULL))
{
n = BSIZE;
(*ls) = (linseg_t*)malloc(n * sizeof(linseg_t));
}
else
{
// при необходимости увеличиваем
if(c >= n)
{
n += BSIZE;
(*ls) = (linseg_t*)realloc((*ls), n * sizeof(linseg_t));
}
}
(*ls)[c].p[0][0] = p0[0][0];
(*ls)[c].p[0][1] = p0[0][1];
(*ls)[c].p[1][0] = p1[0][0];
(*ls)[c].p[1][1] = p1[0][1];
(*ls)[c].flag = 1;
c++;
(*lsnum) = n;
(*lscnt) = c;
return RES_OK;
}
/*******************************************************************************
Создаем массив отрезков
*******************************************************************************/
int linseg_create(double* z, double* x, double* y,
int n, int m, double lev,
linseg_t** ls, int* sz)
{
int lsnum, lscnt, t, in, im, i;
point2d_t p0 = {0};
point2d_t p1 = {0};
double dx;
double dy;
if((ls== NULL)||(z==NULL))
return ERROR_PTR;
lsnum = 0;
lscnt = 0;
for(in = 0; in < n-1; in++)
{
for(im = 0; im < m-1; im++)
{
i = in + im * n;
t = 0;
t += z[i] > lev ? 8 : 0;
t += z[i+n] > lev ? 4 : 0;
t += z[i+n+1] > lev ? 2 : 0;
t += z[i+1] > lev ? 1 : 0;
//printf("%d, %d, %d\n", in, im, t);
switch(t)
{
case 0:
case 15:
break;
case 1:
case 14:
dx = (lev - z[i]) / (z[i+1] - z[i]);
p0[0] = x[in] + dx * (x[in+1] - x[in]);
p0[1] = y[im];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im] + dy * (y[im+1] - y[im]);
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 2:
case 13:
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p0[0] = x[in] + dx * (x[in+1] - x[in]);
p0[1] = y[im + 1];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in + 1];
p1[1] = y[im] + dy * (y[im+1] - y[im]);
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 3:
case 12:
dx = (lev - z[i]) / (z[i+1] - z[i]);
p0[0] = x[in] + dx * (x[in+1] - x[in]);
p0[1] = y[im];
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p1[0] = x[in] + dx * (x[in+1] - x[in]);
p1[1] = y[im+1];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 4:
case 11:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy * (y[im+1] - y[im]);
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p1[0] = x[in] + dx * (x[in+1] - x[in]);
p1[1] = y[im + 1];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 5:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy * (y[im+1] - y[im]);
dx = (lev - z[i]) / (z[i+1] - z[i]);
p1[0] = x[in] + dx * (x[in+1] - x[in]);
p1[1] = y[im];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+n]);
p0[0] = x[in]+dx * (x[in+1] - x[in]);
p0[1] = y[im+1];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im] + dy * (y[im+1] - y[im]);
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 6:
case 9:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy * (y[im+1] - y[im]);
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im]+dy * (y[im+1] - y[im]);
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 7:
case 8:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy * (y[im+1] - y[im]);
dx = (lev - z[i]) / (z[i+1] - z[i]);
p1[0] = x[in] + dx * (x[in+1] - x[in]);
p1[1] = y[im];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
case 10:
dy = (lev - z[i]) / (z[i+n] - z[i]);
p0[0] = x[in];
p0[1] = y[im] + dy * (y[im+1] - y[im]);
dx = (lev - z[i+n]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in] + dx * (x[in+1] - x[in]);
p1[1] = y[im+1];
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
dx = (lev - z[i]) / (z[i+1] - z[i]);
p0[0] = x[in]+dx * (x[in+1] - x[in]);
p0[1] = y[im];
dy = (lev - z[i+1]) / (z[i+n+1] - z[i+1]);
p1[0] = x[in+1];
p1[1] = y[im] + dy * (y[im+1] - y[im]);
add_linseg(ls, &lsnum, &lscnt, &p0, &p1);
break;
default:
break;
}
}
}
*ls = (linseg_t*)realloc(*ls, lscnt * sizeof(linseg_t));
*sz = lscnt;
return RES_OK;
}
/*******************************************************************************
Расчет дистанции между точками
*******************************************************************************/
double dist(point2d_t* p0, point2d_t* p1)
{
double dx, dy;
dx = p0[0][0] - p1[0][0];
dy = p0[0][1] - p1[0][1];
return sqrt(dx*dx + dy*dy);
}
/*******************************************************************************
Стыковка концов отрезков в линию
*******************************************************************************/
int line_create(linseg_t* ls, int nls, line2d_t* line)
{
int i, j, c, n, k;
if(!line || !ls)
return ERROR_PTR;
// printf("*line = %x, *np = %d \n", *line, *np);
i = 0;
while(!(ls[i].flag) && i < nls)
i++;
if(i==nls)
{
line->npoints = 0;
return RES_OK;
}
//printf("i = %d, ls[%d] = [%.1f %.1f] -- [%.1f, %.1f]\n",
// i, i, ls[i].p[0][0], ls[i].p[0][1],
// ls[i].p[1][0], ls[i].p[1][1]);
n = BSIZE;
if(line->points == NULL)
line->points = (point2d_t*)malloc(n*sizeof(point2d_t));
else
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
c = 0;
line->points[c][0] = ls[i].p[0][0];
line->points[c][1] = ls[i].p[0][1];
c++;
line->points[c][0] = ls[i].p[1][0];
line->points[c][1] = ls[i].p[1][1];
c++;
ls[i].flag = 0;
for(i = 0; i < nls; i++)
{
for(j = 0; j < nls; j++)
{
if(ls[j].flag)
{
//сравниваем последнюю точку линии с первой точкой отрезка ls[j]
if(dist(line->points+c-1, ls[j].p) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если первая точка отрезка совпадает, то добавляем
//в линию вторую точку СЗАДИ
line->points[c][0] = ls[j].p[1][0];
line->points[c][1] = ls[j].p[1][1];
ls[j].flag = 0;
c++;
}
}
if(ls[j].flag)
{
// сравниваем последнюю точку линии
// со второй точкой отрезка ls[j]
if(dist(line->points+c-1, ls[j].p+1) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если вторая точка совпадает, то добавляем
//в линию первую точку СЗАДИ
line->points[c][0] = ls[j].p[0][0];
line->points[c][1] = ls[j].p[0][1];
ls[j].flag = 0;
c++;
}
}
if(ls[j].flag)
{
//сравниваем последнюю точку линии с первой точкой отрезка ls[j]
if(dist(line->points, ls[j].p) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если первая точка отрезка совпадает, то добавляем
//в линию вторую точку СПЕРЕДИ
for(k = c; k>0; k--)
{
line->points[k][0] = line->points[k-1][0];
line->points[k][1] = line->points[k-1][1];
}
line->points[0][0] = ls[j].p[1][0];
line->points[0][1] = ls[j].p[1][1];
ls[j].flag = 0;
c++;
}
}
if(ls[j].flag)
{
// сравниваем последнюю точку линии
// со второй точкой отрезка ls[j]
if(dist(line->points, ls[j].p+1) < DIST_TH)
{
// проверяем выделение памяти.
// при необходимости увеличиваем
if(c>=n)
{
n += BSIZE;
line->points = (point2d_t*)realloc(line->points, n*sizeof(point2d_t));
}
//если вторая точка совпадает, то добавляем
//в линию первую точку СПЕРЕДИ
for(k = c; k>0; k--)
{
line->points[k][0] = line->points[k-1][0];
line->points[k][1] = line->points[k-1][1];
}
line->points[0][0] = ls[j].p[0][0];
line->points[0][1] = ls[j].p[0][1];
ls[j].flag = 0;
c++;
}
}
}
}
line->points = (point2d_t*)realloc(line->points, c*sizeof(point2d_t));
line->npoints = c;
return RES_OK;
}

18
examples/src/contour_test.c
Wyświetl plik

@ -17,13 +17,23 @@ int main(int argc, char* argv[])
double z[N*M] = { 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1};
double x[N] = {0.0, 1.0, 2.0};
double y[M] = {0.0, 1.0, 2.0, 3.0};
int i, j;
void* handle; /* DSPL handle */
handle = dspl_load(); /* Load DSPL function */
contour2d_t contour = {0};
contour2d(z, x, y, N, M, 0.5,&contour);
contour2d_t c = {0};
contour2d(z, x, y, N, M, 0.5, &c);
for(i = 0; i < c.nlines; i++)
{
printf("\n");
for(j = 0; j < c.lines[i].npoints; j++)
printf("(%.2f -- %.2f) -- ", c.lines[i].points[j][0],
c.lines[i].points[j][1]);
printf("\n");
}
dspl_free(handle); /* free dspl handle */
return 0;
}

2
include/dspl.c
Wyświetl plik

@ -56,6 +56,7 @@ p_cheby2_ap_zp cheby2_ap_zp ;
p_cmplx2re cmplx2re ;
p_concat concat ;
p_contour2d contour2d ;
p_contour2d_free contour2d_free ;
p_conv conv ;
p_conv_cmplx conv_cmplx ;
p_conv_fft conv_fft ;
@ -276,6 +277,7 @@ void* dspl_load()
LOAD_FUNC(cmplx2re);
LOAD_FUNC(concat);
LOAD_FUNC(contour2d);
LOAD_FUNC(contour2d_free);
LOAD_FUNC(conv);
LOAD_FUNC(conv_cmplx);
LOAD_FUNC(conv_fft);

2
include/dspl.h
Wyświetl plik

@ -865,6 +865,8 @@ DECLARE_FUNC(int, contour2d, double* z
COMMA double lev
COMMA contour2d_t* c);
/*----------------------------------------------------------------------------*/
DECLARE_FUNC(void, contour2d_free, contour2d_t* c);
/*----------------------------------------------------------------------------*/
DECLARE_FUNC(int, conv, double*
COMMA int
COMMA double*