isoron/multirow
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor infinity.c

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-04-29 15:58:51 -04:00
parent 0c20ee2e26
commit c6e6d3d817
17 changed files with 1004 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
infinity/library/include/infinity/greedy.h → infinity/library/include/infinity/infinity-2d.h
View File

@@ -13,19 +13,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MULTIROW_GREEDY_H
#define MULTIROW_GREEDY_H
int GREEDY_write_sage_file(int nrows,
int nrays,
const double *f,
const double *rays,
const double *bounds,
const char *filename);
#ifndef MULTIROW_INFINITY_2D_H
#define MULTIROW_INFINITY_2D_H
int GREEDY_generate_cut(int nrows,
struct Row **rows,
const char *column_types,
struct Row *cut);
#include <multirow/cg.h>
#endif //MULTIROW_GREEDY_H
int INFINITY_2D_generate_cut(const struct MultiRowModel *model, double *bounds);
#endif //MULTIROW_INFINITY_2D_H

25
infinity/library/include/infinity/greedy-2d.h → infinity/library/include/infinity/infinity.h
View File

@@ -13,25 +13,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MULTIROW_INFINITY_H
#define MULTIROW_INFINITY_H
#ifndef MULTIROW_GREEDY_2D_H
#define MULTIROW_GREEDY_2D_H
#include <multirow/cg.h>
#include <multirow/lp.h>
int GREEDY_2D_bound(const double *rays,
const double *bounds,
int nrays,
const double *f,
const double *p,
double *epsilon,
double *v1,
double *v2,
int *index1,
int *index2);
int INFINITY_generate_cut(struct Tableau *tableau, struct Row *cut);
int GREEDY_2D_generate_cut(const double *rays,
int nrays,
const double *f,
double *bounds);
#endif //MULTIROW_GREEDY_2D_H
#endif //MULTIROW_INFINITY_H