Skip to content

GitLab

Commit 68ec2014 authored by Kirill Terekhov's avatar Kirill Terekhov
Browse files

Updates 

Improvements for eclipse grid reader.

Fixed a bug in ElementArray::iterator.
parent 9e65b7d1
Expand all Hide whitespace changes
Inline Side-by-side
Examples/OldDrawGrid/main.cpp
View file @ 68ec2014
......@@ -1223,7 +1223,10 @@ std::vector<face2gl> clip_boundary;
void draw_faces_nc(std::vector<face2gl> & set, int highlight = -1)
{
if( drawedges == 2 || drawedges == 3 ) return;
if( drawedges == 2 || drawedges == 3 ) return;
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glColor4f(0,1,0,0.1);
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE q = 0; q < set.size() ; q++) set[q].draw();
......@@ -1235,12 +1238,17 @@ void draw_faces_nc(std::vector<face2gl> & set, int highlight = -1)
set[highlight].draw();
glEnd();
}
glDisable(GL_POLYGON_OFFSET_FILL);
}
void draw_faces(std::vector<face2gl> & set, int highlight = -1)
{
if( drawedges == 2 || drawedges == 3) return;
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
if( visualization_tag.isValid() ) CommonColorBar->BindTexture();
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE q = 0; q < set.size() ; q++) set[q].draw_colour();
glEnd();
......@@ -1252,16 +1260,25 @@ void draw_faces(std::vector<face2gl> & set, int highlight = -1)
set[highlight].draw();
glEnd();
}
glDisable(GL_POLYGON_OFFSET_FILL);
}
void draw_faces_alpha(std::vector<face2gl> & set, double alpha)
{
if( drawedges == 2 || drawedges==3) return;
if( visualization_tag.isValid() ) CommonColorBar->BindTexture();
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE q = 0; q < set.size() ; q++) set[q].draw_colour_alpha(alpha);
glEnd();
if( visualization_tag.isValid() ) CommonColorBar->UnbindTexture();
glDisable(GL_POLYGON_OFFSET_FILL);
}
void draw_edges(std::vector<face2gl> & set, int highlight = -1)
......@@ -1283,31 +1300,53 @@ void draw_edges(std::vector<face2gl> & set, int highlight = -1)
void draw_faces_interactive_nc(std::vector<face2gl> & set)
{
if( drawedges == 2 || drawedges==3 ) return;
if( drawedges == 2 || drawedges==3 ) return;
glColor4f(0,1,0,0.1);
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE q = 0; q < set.size() ; q++) if( set[q].get_flag() ) set[q].draw();
glEnd();
glDisable(GL_POLYGON_OFFSET_FILL);
}
void draw_faces_interactive(std::vector<face2gl> & set)
{
if( drawedges == 2 || drawedges==3 ) return;
if( visualization_tag.isValid() ) CommonColorBar->BindTexture();
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE q = 0; q < set.size() ; q++) if( set[q].get_flag() ) set[q].draw_colour();
glEnd();
if( visualization_tag.isValid() ) CommonColorBar->UnbindTexture();
glDisable(GL_POLYGON_OFFSET_FILL);
}
void draw_faces_interactive_alpha(std::vector<face2gl> & set, double alpha)
{
if( drawedges == 2 || drawedges==3 ) return;
if( visualization_tag.isValid() ) CommonColorBar->BindTexture();
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE q = 0; q < set.size() ; q++) if( set[q].get_flag() ) set[q].draw_colour_alpha(alpha);
glEnd();
if( visualization_tag.isValid() ) CommonColorBar->UnbindTexture();
glDisable(GL_POLYGON_OFFSET_FILL);
}
void draw_edges_interactive(std::vector<face2gl> & set)
......@@ -2329,6 +2368,9 @@ public:
void draw_clip(INMOST_DATA_ENUM_TYPE pace, Storage::real n[3])
{
if( visualization_tag.isValid() ) CommonColorBar->BindTexture();
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glBegin(GL_TRIANGLES);
for(INMOST_DATA_ENUM_TYPE k = 0; k < cells.size(); k+=pace) if( cells[k]->GetMarker(marker))
{
......@@ -2405,6 +2447,8 @@ public:
}
}
glEnd();
glDisable(GL_POLYGON_OFFSET_FILL);
if( visualization_tag.isValid() ) CommonColorBar->UnbindTexture();
}
void draw_clip_edges(INMOST_DATA_ENUM_TYPE pace, Storage::real n[3])
......@@ -2608,6 +2652,11 @@ public:
if( state == CLIP_FACE_INSIDE )
{
ElementArray<Node> nodes = Face(mm,faces[k])->getNodes();
glEnable(GL_POLYGON_OFFSET_FILL);
glPolygonOffset(1.0, 1.0);
glBegin(GL_POLYGON);
if( visualization_tag.isValid() )
{
......@@ -2624,6 +2673,8 @@ public:
glVertex3dv(&nodes[q].Coords()[0]);
}
glEnd();
glDisable(GL_POLYGON_OFFSET_FILL);
}
}
mm->IntegerDF(faces[k],clip_state) = state;
......@@ -2899,7 +2950,7 @@ void set_matrix3d()
else
{
const double pi = 3.1415926535897932384626433832795;
const double znear = 1;
const double znear = zoom*2*std::max(std::max( sright-sleft, stop-sbottom ), sfar-snear)*0.1;
const double zfar = 1000000.0;
const double fH = znear * tan( 60.0 / 360.0 * pi);
double fW = fH * aspect;
......@@ -3775,6 +3826,7 @@ double display_elem_info(Element e, double top, double left, double interval)
void draw_screen()
{
//glDepthMask(GL_TRUE);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
set_matrix3d();
......
Source/Headers/container.hpp
View file @ 68ec2014
......@@ -75,9 +75,9 @@ namespace INMOST
_iterator(etype * i):e(i){}
_iterator(const _iterator & other){e = other.e;}
~_iterator() {};
_iterator operator -(size_t n) { return _iterator(e-n); }
_iterator operator -(size_t n) const { return _iterator(e-n); }
_iterator & operator -=(size_t n) { e-=n; return *this; }
_iterator operator +(size_t n) { return _iterator(e+n); }
_iterator operator +(size_t n) const { return _iterator(e+n); }
_iterator & operator +=(size_t n) { e+=n; return *this; }
_iterator & operator ++(){ ++e; return *this;}
_iterator operator ++(int){ return _iterator(e++); }
......@@ -94,7 +94,7 @@ namespace INMOST
bool operator <=(const _iterator & other) const { return e <= other.e;}
bool operator >=(const _iterator & other) const { return e >= other.e;}
operator void *() {return static_cast<void *> (e);}
operator const void *() {return const_cast<const void *> (e);}
operator const void *() const {return const_cast<const void *> (e);}
};
typedef _iterator<element> iterator;
typedef _iterator<const element> const_iterator;
......@@ -113,9 +113,9 @@ namespace INMOST
_reverse_iterator(etype * i):e(i){}
_reverse_iterator(const _reverse_iterator & other){e = other.e;}
~_reverse_iterator() {};
_reverse_iterator operator -(size_t n) { return _reverse_iterator(e+n); }
_reverse_iterator operator -(size_t n) const { return _reverse_iterator(e+n); }
_reverse_iterator & operator -=(size_t n) { e+=n; return *this; }
_reverse_iterator operator +(size_t n) {return _reverse_iterator(e-n); }
_reverse_iterator operator +(size_t n) const {return _reverse_iterator(e-n); }
_reverse_iterator & operator +=(size_t n) { e-=n; return *this; }
_reverse_iterator & operator ++(){ --e; return *this;}
_reverse_iterator operator ++(int){ return _reverse_iterator(e--); }
......@@ -132,6 +132,7 @@ namespace INMOST
bool operator <=(const _reverse_iterator & other) const { return e <= other.e;}
bool operator >=(const _reverse_iterator & other) const { return e >= other.e;}
operator void *() {return static_cast<void *> (e);}
operator const void *() const {return static_cast<const void *> (e);}
};
typedef _reverse_iterator<element> reverse_iterator;
typedef _reverse_iterator<const element> const_reverse_iterator;
......@@ -536,9 +537,9 @@ namespace INMOST
_iterator(dtype * i):e(i){}
_iterator(const _iterator & other){e = other.e;}
~_iterator() {};
_iterator operator -(size_t n) { return _iterator(e-n); }
_iterator operator -(size_t n) const { return _iterator(e-n); }
_iterator & operator -=(size_t n) { e-=n; return *this; }
_iterator operator +(size_t n) { return _iterator(e+n); }
_iterator operator +(size_t n) const { return _iterator(e+n); }
_iterator & operator +=(size_t n) { e+=n; return *this; }
_iterator & operator ++(){ ++e; return *this;}
_iterator operator ++(int){ return _iterator(e++); }
......@@ -573,9 +574,9 @@ namespace INMOST
_reverse_iterator(dtype * i):e(i){}
_reverse_iterator(const _reverse_iterator & other){e = other.e;}
~_reverse_iterator() {};
_reverse_iterator operator -(size_t n) { return _reverse_iterator(e+n); }
_reverse_iterator operator -(size_t n) const { return _reverse_iterator(e+n); }
_reverse_iterator & operator -=(size_t n) { e+=n; return *this; }
_reverse_iterator operator +(size_t n) {return _reverse_iterator(e-n); }
_reverse_iterator operator +(size_t n) const {return _reverse_iterator(e-n); }
_reverse_iterator & operator +=(size_t n) { e-=n; return *this; }
_reverse_iterator & operator ++(){ --e; return *this;}
_reverse_iterator operator ++(int){ return _reverse_iterator(e--); }
......@@ -1547,9 +1548,9 @@ namespace INMOST
_iterator(dtype * i):e(i){}
_iterator(const _iterator & other){e = other.e;}
~_iterator() {};
_iterator operator -(size_type n) { return _iterator(e-n); }
_iterator operator -(size_type n) const { return _iterator(e-n); }
_iterator & operator -=(size_type n) { e-=n; return *this; }
_iterator operator +(size_type n) { return _iterator(e+n); }
_iterator operator +(size_type n) const { return _iterator(e+n); }
_iterator & operator +=(size_type n) { e+=n; return *this; }
_iterator & operator ++(){ ++e; return *this;}
_iterator operator ++(int){ return _iterator(e++); }
......@@ -1559,14 +1560,14 @@ namespace INMOST
dtype & operator *() { return *e; }
dtype * operator ->() { return e; }
_iterator & operator =(_iterator const & other) { e = other.e; return *this; }
bool operator ==(const _iterator & other) { return e == other.e;}
bool operator !=(const _iterator & other) { return e != other.e;}
bool operator <(const _iterator & other) { return e < other.e;}
bool operator >(const _iterator & other) { return e > other.e;}
bool operator <=(const _iterator & other) { return e <= other.e;}
bool operator >=(const _iterator & other) { return e >= other.e;}
bool operator ==(const _iterator & other) const { return e == other.e;}
bool operator !=(const _iterator & other) const { return e != other.e;}
bool operator <(const _iterator & other) const { return e < other.e;}
bool operator >(const _iterator & other) const { return e > other.e;}
bool operator <=(const _iterator & other) const { return e <= other.e;}
bool operator >=(const _iterator & other) const { return e >= other.e;}
operator void *() {return static_cast<void *> (e);}
void * cast_to_void(){return static_cast<void *>(e);}
operator const void *() const {return static_cast<const void *> (e);}
};
typedef _iterator<element> iterator;
typedef _iterator<const element> const_iterator;
......@@ -1585,9 +1586,9 @@ namespace INMOST
_reverse_iterator(dtype * i):e(i){}
_reverse_iterator(const _reverse_iterator & other){e = other.e;}
~_reverse_iterator() {};
_reverse_iterator operator -(size_type n) { return _reverse_iterator(e+n); }
_reverse_iterator operator -(size_type n) const { return _reverse_iterator(e+n); }
_reverse_iterator & operator -=(size_type n) { e+=n; return *this; }
_reverse_iterator operator +(size_type n) {return _reverse_iterator(e-n); }
_reverse_iterator operator +(size_type n) const {return _reverse_iterator(e-n); }
_reverse_iterator & operator +=(size_type n) { e-=n; return *this; }
_reverse_iterator & operator ++(){ --e; return *this;}
_reverse_iterator operator ++(int){ return _reverse_iterator(e--); }
......@@ -1597,14 +1598,14 @@ namespace INMOST
dtype & operator *() { return *e; }
dtype * operator ->() { return e; }
_reverse_iterator & operator =(_reverse_iterator const & other) { e = other.e; return *this;}
bool operator ==(const _reverse_iterator & other) { return e == other.e;}
bool operator !=(const _reverse_iterator & other) { return e != other.e;}
bool operator <(const _reverse_iterator & other) { return e < other.e;}
bool operator >(const _reverse_iterator & other) { return e > other.e;}
bool operator <=(const _reverse_iterator & other) { return e <= other.e;}
bool operator >=(const _reverse_iterator & other) { return e >= other.e;}
bool operator ==(const _reverse_iterator & other) const { return e == other.e;}
bool operator !=(const _reverse_iterator & other) const { return e != other.e;}
bool operator <(const _reverse_iterator & other) const { return e < other.e;}
bool operator >(const _reverse_iterator & other) const { return e > other.e;}
bool operator <=(const _reverse_iterator & other) const { return e <= other.e;}
bool operator >=(const _reverse_iterator & other) const { return e >= other.e;}
operator void *() {return static_cast<void *> (e);}
void * cast_to_void(){return static_cast<void *>(e);}
operator const void *() const {return static_cast<const void *> (e);}
};
typedef _reverse_iterator<element> reverse_iterator;
typedef _reverse_iterator<const element> const_reverse_iterator;
......@@ -2037,12 +2038,12 @@ namespace INMOST
dtype & operator *() { return *it; }
dtype * operator ->() { return &*it; }
_iterator & operator =(_iterator const & other) {it = other.it; cur_list = other.cur_list; lists = other.lists; return *this; }
bool operator ==(const _iterator & other) { return it == other.it;}
bool operator !=(const _iterator & other) { return it != other.it;}
bool operator <(const _iterator & other) { return it < other.it;}
bool operator >(const _iterator & other) { return it > other.it;}
bool operator <=(const _iterator & other) { return it <= other.it;}
bool operator >=(const _iterator & other) { return it >= other.it;}
bool operator ==(const _iterator & other) const { return it == other.it;}
bool operator !=(const _iterator & other) const { return it != other.it;}
bool operator <(const _iterator & other) const { return it < other.it;}
bool operator >(const _iterator & other) const { return it > other.it;}
bool operator <=(const _iterator & other) const { return it <= other.it;}
bool operator >=(const _iterator & other) const { return it >= other.it;}
};
typedef _iterator<inner_type> iterator;
typedef _iterator<const inner_type> const_iterator;
......@@ -2189,9 +2190,9 @@ namespace INMOST
iterator(chunk_array<element,block_bits> * c, size_type pos):link(c),pos(pos){}
iterator(const iterator & other){link = other.link; pos = other.pos;}
~iterator() {};
iterator operator -(size_type n) { return iterator(link,pos-n); }
iterator operator -(size_type n) const { return iterator(link,pos-n); }
iterator & operator -=(size_type n) { pos-=n; return *this; }
iterator operator +(size_type n) { return iterator(link,pos+n); }
iterator operator +(size_type n) const { return iterator(link,pos+n); }
iterator & operator +=(size_type n) { pos+=n; return *this; }
iterator & operator ++(){ ++pos; return *this;}
iterator operator ++(int){ return iterator(link,pos++); }
......@@ -2201,12 +2202,12 @@ namespace INMOST
element & operator *() { return link->at(pos); }
element * operator ->() { return &link->at(pos); }
iterator & operator =(iterator const & other) { link = other.link; pos = other.pos; return *this; }
bool operator ==(const iterator & other) { assert(link == other.link); return pos == other.pos;}
bool operator !=(const iterator & other) { assert(link == other.link); return pos != other.pos;}
bool operator <(const iterator & other) { assert(link == other.link); return pos < other.pos;}
bool operator >(const iterator & other) { assert(link == other.link); return pos > other.pos;}
bool operator <=(const iterator & other) { assert(link == other.link); return pos <= other.pos;}
bool operator >=(const iterator & other) { assert(link == other.link); return pos >= other.pos;}
bool operator ==(const iterator & other) const { assert(link == other.link); return pos == other.pos;}
bool operator !=(const iterator & other) const { assert(link == other.link); return pos != other.pos;}
bool operator <(const iterator & other) const { assert(link == other.link); return pos < other.pos;}
bool operator >(const iterator & other) const { assert(link == other.link); return pos > other.pos;}
bool operator <=(const iterator & other) const { assert(link == other.link); return pos <= other.pos;}
bool operator >=(const iterator & other) const { assert(link == other.link); return pos >= other.pos;}
};
class const_iterator
......@@ -2224,9 +2225,9 @@ namespace INMOST
const_iterator(const chunk_array<element,block_bits> * c, size_type pos):link(c),pos(pos){}
const_iterator(const const_iterator & other) :link(other.link) {pos = other.pos;}
~const_iterator() {};
const_iterator operator -(size_type n) { return const_iterator(link,pos-n); }
const_iterator operator -(size_type n) const { return const_iterator(link,pos-n); }
const_iterator & operator -=(size_type n) { pos-=n; return *this; }
const_iterator operator +(size_type n) { return const_iterator(link,pos+n); }
const_iterator operator +(size_type n) const { return const_iterator(link,pos+n); }
const_iterator & operator +=(size_type n) { pos+=n; return *this; }
const_iterator & operator ++(){ ++pos; return *this;}
const_iterator operator ++(int){ return const_iterator(link,pos++); }
......@@ -2236,12 +2237,12 @@ namespace INMOST
const element & operator *() { return link->at(pos); }
const element * operator ->() { return &link->at(pos); }
const_iterator & operator =(const_iterator const & other) { link = other.link; pos = other.pos; return *this; }
bool operator ==(const const_iterator & other) { assert(link == other.link); return pos == other.pos;}
bool operator !=(const const_iterator & other) { assert(link == other.link); return pos != other.pos;}
bool operator <(const const_iterator & other) { assert(link == other.link); return pos < other.pos;}
bool operator >(const const_iterator & other) { assert(link == other.link); return pos > other.pos;}
bool operator <=(const const_iterator & other) { assert(link == other.link); return pos <= other.pos;}
bool operator >=(const const_iterator & other) { assert(link == other.link); return pos >= other.pos;}
bool operator ==(const const_iterator & other) const { assert(link == other.link); return pos == other.pos;}
bool operator !=(const const_iterator & other) const { assert(link == other.link); return pos != other.pos;}
bool operator <(const const_iterator & other) const { assert(link == other.link); return pos < other.pos;}
bool operator >(const const_iterator & other) const { assert(link == other.link); return pos > other.pos;}
bool operator <=(const const_iterator & other) const { assert(link == other.link); return pos <= other.pos;}
bool operator >=(const const_iterator & other) const { assert(link == other.link); return pos >= other.pos;}
};
void inner_resize(size_type new_size)
......
Source/Headers/inmost_mesh.h
View file @ 68ec2014
......@@ -163,8 +163,8 @@ namespace INMOST
iterator(Mesh * m, const cont_t::iterator & other ) : cont_t::iterator(other) , m_link(m){assert(m_link);}
iterator(const iterator & other ) : cont_t::iterator(other), m_link(other.m_link) {assert(m_link);}
ptrdiff_t operator -(const iterator & other) const {return static_cast<const cont_t::iterator>(*this)-static_cast<const cont_t::iterator>(other);}
iterator operator +(size_t n){iterator ret(*this); ret.cont_t::iterator::operator+(n); return ret;}
iterator operator -(size_t n){iterator ret(*this); ret.cont_t::iterator::operator-(n); return ret;}
iterator operator +(size_t n) const{return iterator(m_link,cont_t::iterator::operator +(n));}
iterator operator -(size_t n) const{return iterator(m_link,cont_t::iterator::operator -(n));}
iterator & operator ++() {cont_t::iterator::operator++(); return *this;}
iterator operator ++(int) {iterator ret(*this); cont_t::iterator::operator++(); return ret;}
iterator & operator --() {cont_t::iterator::operator--(); return *this;}
......@@ -180,8 +180,8 @@ namespace INMOST
reverse_iterator(Mesh * m, const cont_t::reverse_iterator & other ) : cont_t::reverse_iterator(other), m_link(m) {assert(m_link);}
reverse_iterator(const reverse_iterator & other ) : cont_t::reverse_iterator(other), m_link(other.m_link) {assert(m_link);}
ptrdiff_t operator -(const reverse_iterator & other) const {return static_cast<const cont_t::reverse_iterator>(other)-static_cast<const cont_t::reverse_iterator>(*this);}
reverse_iterator operator +(size_t n){reverse_iterator ret(*this); ret.cont_t::reverse_iterator::operator+(n); return ret;}
reverse_iterator operator -(size_t n){reverse_iterator ret(*this); ret.cont_t::reverse_iterator::operator-(n); return ret;}
reverse_iterator operator +(size_t n) const {return reverse_iterator(m_link,cont_t::reverse_iterator::operator+(n));}
reverse_iterator operator -(size_t n) const {return reverse_iterator(m_link,cont_t::reverse_iterator::operator-(n));}
reverse_iterator & operator ++() {cont_t::reverse_iterator::operator++(); return *this;}
reverse_iterator operator ++(int) {reverse_iterator ret(*this); cont_t::reverse_iterator::operator++(); return ret;}
reverse_iterator & operator --() {cont_t::reverse_iterator::operator--(); return *this;}
......
Source/IO/mesh_ecl_file.cpp
View file @ 68ec2014
This diff is collapsed.
Source/Mesh/incident_matrix.hpp
View file @ 68ec2014
......@@ -57,6 +57,7 @@ namespace INMOST
Mesh * mesh;
dynarray< unsigned char, 4096 > matrix;
dynarray< char ,256 > visits;
dynarray< char ,256 > visits0;
dynarray<HandleType, 256> head_column;
dynarray<HandleType, 256> head_row;
dynarray<unsigned char ,256> head_row_count;
......@@ -66,7 +67,9 @@ namespace INMOST
dynarray< char , 256 > hide_column;
dynarray< char , 256 > hide_row;
dynarray< char , 256 > stub_row;
std::vector< std::pair<std::vector<int>,double> > remember;
double min_loop_measure;
bool print;
bool do_hide_row(unsigned k)
{
......@@ -144,6 +147,7 @@ namespace INMOST
for(typename ElementArray<T>::size_type j = 1; j < data.size(); j++)
{
n1 = data[j]->getNodes();
assert(nodes.back() == n1[0] || nodes.back() == n1[1]);
if( nodes.back() == n1[0] )
nodes.push_back(n1[1]);
else
......@@ -151,8 +155,18 @@ namespace INMOST
}
Storage::real x[3] = {0,0,0};
Storage::real_array x0 = nodes[0].Coords();
for(unsigned i = 1; i < nodes.size()-1; i++)
Storage::real x0[3] = {0,0,0};
for(unsigned i = 0; i < nodes.size(); i++)
{
Storage::real_array v = nodes[i].Coords();
x0[0] += v[0];
x0[1] += v[1];
if( mdim == 3 ) x0[2] += v[2];
}
x0[0] /= (Storage::real)nodes.size();
x0[1] /= (Storage::real)nodes.size();
x0[2] /= (Storage::real)nodes.size();
for(unsigned i = 0; i < nodes.size()-1; i++)
{
Storage::real_array v1 = nodes[i].Coords();
Storage::real_array v2 = nodes[i+1].Coords();
......@@ -290,10 +304,22 @@ namespace INMOST
temp_loop.at(j) = head_column[insert_order[j]];
Storage::real measure = compute_measure(temp_loop);
if( min_loop.empty() || min_loop_measure >= measure )
if( print )
{
std::cout << "found loop [" << temp_loop.size() <<"]: ";
for(unsigned j = 0; j < temp_loop.size(); ++j)
std::cout << insert_order[j] << " ";
std::cout << "measure " << measure << std::endl;
}
if( min_loop.empty() || min_loop_measure + 1.0e-6 >= measure )
{
min_loop.swap(temp_loop);
min_loop_measure = measure;
if( !(fabs(min_loop_measure-measure) < 1.0e-6 && min_loop.size() < temp_loop.size()) )
{
min_loop.swap(temp_loop);
min_loop_measure = measure;
if( print ) std::cout << "selected as current loop" << std::endl;
}
//~ if( min_loop.size() == head_column.size() ) // all elements were visited
//~ {
//~ unsigned num = 0;
......@@ -370,16 +396,38 @@ namespace INMOST
{
for(dynarray<HandleType,256>::size_type j = 0; j < head_row.size(); j++)
std::cout << static_cast<int>(matrix[k*head_row.size()+ j]);
std::cout << " " << (int)visits[k];
std::cout << " " << (int)visits[k] << " " << (int)visits0[k];
Element(mesh,head_column[k])->Centroid(cnt);
std::cout << " " << cnt[0] << " " << cnt[1] << " " << cnt[2];
std::cout << std::endl;
}
std::cout << std::endl;
std::cout << "loops [" << remember.size() << "]:" << std::endl;
for(size_t k = 0; k < remember.size(); ++k)
{
std::cout << k << " size " << remember[k].first.size() << ": ";
for(size_t l = 0; l < remember[k].first.size()-1; ++l)
std::cout << remember[k].first[l] << ", ";
std::cout << remember[k].first.back() << " measure " << remember[k].second << std::endl;
}
if( GetHandleElementType(head_column[0]) == EDGE )
{
std::cout << "edges [" << head_column.size() << "]" << std::endl;
for(int k = 0; k < (int)head_column.size(); ++k)
{
Edge e(mesh,head_column[k]);
std::cout << "(" << e->getBeg()->Coords()[0] << "," << e->getBeg()->Coords()[1] << "," << e->getBeg()->Coords()[2] << ") <-> (" << e->getEnd()->Coords()[0] << "," << e->getEnd()->Coords()[1] << "," << e->getEnd()->Coords()[2] << ")" << std::endl;
}
std::cout << "edges [" << head_column.size() << "]" << std::endl;
for(int k = 0; k < (int)head_column.size(); ++k)
{
Edge e(mesh,head_column[k]);
std::cout << e->getBeg()->GetHandle() << " <-> " << e->getEnd()->GetHandle() << std::endl;
}
}
}
template<typename InputIterator>
incident_matrix(Mesh * mesh, InputIterator beg, InputIterator end, typename ElementArray<T>::size_type num_inner)
: mesh(mesh), head_column(beg,end), min_loop()
incident_matrix(Mesh * mesh, InputIterator beg, InputIterator end, typename ElementArray<T>::size_type num_inner, bool print = false)
: mesh(mesh), head_column(beg,end), min_loop(), print(print)
{
min_loop.SetMeshLink(mesh);
temp_loop.SetMeshLink(mesh);
......@@ -389,9 +437,11 @@ namespace INMOST
MarkerType hide_marker = mesh->CreateMarker();
visits.resize(head_column.size());
visits0.resize(head_column.size());
for(typename dynarray<HandleType, 256>::size_type it = 0; it < head_column.size(); ++it)
{
visits[it] = it < num_inner ? 2 : 1;
visits0[it] = visits[it];
Element::adj_type const & sub = mesh->LowConn(head_column[it]);
for(Element::adj_type::size_type jt = 0; jt < sub.size(); ++jt)
{
......@@ -471,21 +521,37 @@ namespace INMOST
min_loop_measure = 1.0e+20;
recursive_find(first,1);
if( min_loop.empty() )
{
if( print ) std::cout << "abandon " << first << std::endl;
remember.push_back(std::make_pair(std::vector<int>(1,first),-1.0));
visits[first]--; //don't start again from this element
}
}
} while( min_loop.empty() && first != UINT_MAX );
ret.insert(ret.end(),min_loop.begin(),min_loop.end());
min_loop.clear();
if( !ret.empty() )
{
std::vector<int> add_remember;
add_remember.reserve(min_loop.size());
MarkerType hide_marker = mesh->CreateMarker();
for(typename ElementArray<T>::size_type k = 0; k < ret.size(); k++) mesh->SetMarker(ret.at(k),hide_marker);
if( print ) std::cout << "return loop [" << ret.size() << "]:";
for(dynarray<HandleType,256>::size_type k = 0; k < head_column.size(); k++)
if( mesh->GetMarker(head_column[k],hide_marker) ) visits[k]--;
if( mesh->GetMarker(head_column[k],hide_marker) )
{
visits[k]--;
add_remember.push_back(k);
if( print ) std::cout << k << " ";
}
if( print ) std::cout << std::endl;
for(typename ElementArray<T>::size_type k = 0; k < ret.size(); k++) mesh->RemMarker(ret.at(k),hide_marker);