tmp update
This commit is contained in:
19
lki/lki.h
19
lki/lki.h
@@ -53,8 +53,8 @@ public:
|
||||
gctl::text_descriptor &desc, int kernel_size, int box_size, double epsilon,
|
||||
std::string variogram_type, std::string variogram_para);
|
||||
void ReadConstrainNodes(std::string filename, gctl::text_descriptor &desc);
|
||||
void WriteTargetNodes(std::string filename, const gctl::text_descriptor &desc);
|
||||
void InitTargetNodes(std::string para);
|
||||
void WriteTargetNodes(std::string filename, gctl::text_descriptor &desc);
|
||||
void InitTargetNodes(std::string para, gctl::text_descriptor &desc);
|
||||
void CalKernel();
|
||||
void CalKernel(const gctl::point3dc &tar_node);
|
||||
void set_kernel_size(unsigned int k){MatSize = k+1;}
|
||||
@@ -105,7 +105,7 @@ void LKI::Routine(std::string inname, std::string tarname, std::string outname,
|
||||
}
|
||||
|
||||
ReadConstrainNodes(inname, desc);
|
||||
InitTargetNodes(tarname);
|
||||
InitTargetNodes(tarname, desc);
|
||||
|
||||
unsigned int k_size = kernel_size;
|
||||
if (k_size <= 1)
|
||||
@@ -211,7 +211,8 @@ void LKI::ReadConstrainNodes(std::string filename, gctl::text_descriptor &desc)
|
||||
//read_text2array(filename, ConsNodes);
|
||||
|
||||
gctl::_2d_vector table_data;
|
||||
gctl::read_text2vector2d(filename, table_data, desc);
|
||||
desc.file_name_ = filename;
|
||||
gctl::read_text2vector2d(desc, table_data);
|
||||
|
||||
if (table_data.size() <= 1)
|
||||
{
|
||||
@@ -230,19 +231,21 @@ void LKI::ReadConstrainNodes(std::string filename, gctl::text_descriptor &desc)
|
||||
return;
|
||||
}
|
||||
|
||||
void LKI::WriteTargetNodes(std::string filename, const gctl::text_descriptor &desc)
|
||||
void LKI::WriteTargetNodes(std::string filename, gctl::text_descriptor &desc)
|
||||
{
|
||||
save_array2text(filename, TargNodes, desc);
|
||||
desc.file_name_ = filename;
|
||||
save_array2text(desc, TargNodes);
|
||||
return;
|
||||
}
|
||||
|
||||
void LKI::InitTargetNodes(std::string para)
|
||||
void LKI::InitTargetNodes(std::string para, gctl::text_descriptor &desc)
|
||||
{
|
||||
// try to use the para as a file name
|
||||
if (access(para.c_str(), F_OK) != -1)
|
||||
{
|
||||
desc.file_name_ = para;
|
||||
std::vector<gctl::point2dc> tmp_vec;
|
||||
gctl::read_text2vector(para, tmp_vec);
|
||||
gctl::read_text2vector(desc, tmp_vec);
|
||||
|
||||
TargNodes.resize(tmp_vec.size());
|
||||
for (int i = 0; i < tmp_vec.size(); ++i)
|
||||
|
Reference in New Issue
Block a user