8303521702

Committed 15 Mar 2024 11:37PM UTC coverage: 65.527% (-0.01%) from 65.538%

Build # 8303521702

Build Type

push

github

Committed by

web-flow

Commit Message

Decision hint queue (#494)

* Fixed typos

* rename int_queue_t size with capacity

* enhanced int_queue

* added queue for next decision

* Clear hint queue on conflict

* Added two queues (top and hint)

* fixed bug

* added solver hints in NRA

* model_interpolation questions

* model_interpolation does not perform request_top_decision

* Remove shortcut variables from the queue

* regression prints execution time

* nra_plugin.c hint only on real solution

* variable selection forces decision on hint

* fix random decision

* trace printing

* changed the gold of a model interpolant

* added option for test issue204.smt2

* Removed ToDo

* avoid dupplication in top_decision_queue

* Revert "regression prints execution time"

This reverts commit aec6c21e4.

* Update mcsat_decision (fixed aux decision problems) and moved hinted queue reset to pop.

* Added force_decision for top_variables

---------

Co-authored-by: Thomas Hader <thomas.hader@sri.com>
Co-authored-by: Thomas Hader <tom@hader.email>

Run Details

96 of 132 new or added lines in 7 files covered. (72.73%)

15 existing lines in 4 files now uncovered.

79752 of 121708 relevant lines covered (65.53%)

1481502.14 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

74.65

/src/utils/int_queues.c

/*
 * This file is part of the Yices SMT Solver.
 * Copyright (C) 2017 SRI International.
 *
 * Yices 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.
 *
 * Yices 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 Yices.  If not, see <http://www.gnu.org/licenses/>.
 */

/*
 * QUEUES OF 32BIT SIGNED INTEGERS
 */

#include <assert.h>

#include "utils/int_queues.h"
#include "utils/memalloc.h"


/**
 * Initialize a queue of capacity n
 */
void init_int_queue(int_queue_t *q, uint32_t n) {
  if (n == 0) {
    n = DEFAULT_INT_QUEUE_INITIAL_CAPACITY;
  } else if (n > MAX_INT_QUEUE_CAPACITY) {
    out_of_memory();
  }

  q->data = (int32_t *) safe_malloc(n * sizeof(int32_t));
  q->capacity = n;
  q->head = 0;
  q->tail = 0;
}


/**
 * Delete: free data array
 */
void delete_int_queue(int_queue_t *q) {
  safe_free(q->data);
  q->data = NULL;
}

/**
 * Resize the queue. make data array 50% larger.
 * content of data array is unchanged
 */
static
void resize_queue(int_queue_t *q) {
  uint32_t n;

  n = q->capacity + 1;
  n += n >> 1;

  if (n > MAX_INT_QUEUE_CAPACITY) {
    out_of_memory();
  }

  q->data = (int32_t *) safe_realloc(q->data, n * sizeof(int32_t));
  q->capacity = n;
}

/**
 * Push element x at the end of the queue
 */
void int_queue_push(int_queue_t *q, int32_t x) {
  uint32_t i, n, j;

  i = q->tail;
  q->data[i] = x;
  i ++;
  q->tail = i;

  if (i == q->capacity) {
    if (q->head == 0) {
      /*
       * full queue, stored in data[0...size-1],
       * just increase the size
       */
      resize_queue(q);
    } else {
      q->tail = 0;
    }
  } else if (i == q->head) {
    /*
     * full queue, stored in data[0..i-1][head .. size-1]
     * increase the size and shift data[head .. size - 1] to the end
     * of the new data array.
     */
    n = q->capacity;
    resize_queue(q);
    j = q->capacity;
    do {
      n --;
      j --;
      q->data[j] = q->data[n];
    } while (n > i);
    q->head = j;
  }
}

/**
 * Push a[0 ... n-1] in the queue (in this order)
 */
void int_queue_push_array(int_queue_t *q, int32_t *a, uint32_t n) {
  uint32_t i;

  for (i=0; i<n; i++) {
    int_queue_push(q, a[i]);
  }
}

/**
 * Return first element and remove it
 */
int32_t int_queue_pop(int_queue_t *q) {
  uint32_t h;
  int32_t x;

  assert(q->head != q->tail);

  h = q->head;
  x = q->data[h];
  h ++;
  if (h >= q->capacity) h = 0;
  q->head = h;

  return x;
}

/**
 * Get the first element (don't remove it).
 */
int32_t int_queue_first(const int_queue_t *q) {
  assert(q->head != q->tail);
  return q->data[q->head];
}

/**
 * Get the last element (don't remove it)
 */
int32_t int_queue_last(const int_queue_t *q) {
  uint32_t i;

  assert(q->head != q->tail);
  i = q->tail;
  if (i == 0) {
    i = q->capacity;
  }
  assert(i > 0);
  return q->data[i-1];
}

/**
 * Get element at position i
 */
int32_t int_queue_at(const int_queue_t *q, uint32_t i) {
  assert(q->head != q->tail);

  if (q->head < q->tail) {
    assert(q->head + i < q->tail);
    return q->data[q->head + i];
  } else if (q->head > q->tail) {
    uint32_t size_first = q->capacity - q->head;
    assert(i < size_first || i - size_first < q->tail);
    return i < size_first
      ? q->data[q->head + i]
      : q->data[i - size_first];
  }

  assert(false);
  return 0;
}

/**
 * Get size of queue
 */
uint32_t int_queue_size(const int_queue_t *q) {
  if (q->head <= q->tail) {
    return q->tail - q->head;
  } else {
    return (q->capacity - q->head) + q->tail;
  }
}

1	/*
2	* This file is part of the Yices SMT Solver.
3	* Copyright (C) 2017 SRI International.
4	*
5	* Yices is free software: you can redistribute it and/or modify
6	* it under the terms of the GNU General Public License as published by
7	* the Free Software Foundation, either version 3 of the License, or
8	* (at your option) any later version.
9	*
10	* Yices is distributed in the hope that it will be useful,
11	* but WITHOUT ANY WARRANTY; without even the implied warranty of
12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	* GNU General Public License for more details.
14	*
15	* You should have received a copy of the GNU General Public License
16	* along with Yices. If not, see <http://www.gnu.org/licenses/>.
17	*/
18
19	/*
20	* QUEUES OF 32BIT SIGNED INTEGERS
21	*/
22
23	#include <assert.h>
24
25	#include "utils/int_queues.h"
26	#include "utils/memalloc.h"
27
28
29	/**
30	* Initialize a queue of capacity n
31	*/
32	void init_int_queue(int_queue_t *q, uint32_t n) {	98,162✔
33	if (n == 0) {	98,162✔
34	n = DEFAULT_INT_QUEUE_INITIAL_CAPACITY;	71,304✔
35	} else if (n > MAX_INT_QUEUE_CAPACITY) {	26,858✔
UNCOV 36	out_of_memory();	×
37	}
38
39	q->data = (int32_t ) safe_malloc(n sizeof(int32_t));	98,162✔
40	q->capacity = n;	98,162✔
41	q->head = 0;	98,162✔
42	q->tail = 0;	98,162✔
43	}	98,162✔
44
45
46	/**
47	* Delete: free data array
48	*/
49	void delete_int_queue(int_queue_t *q) {	98,162✔
50	safe_free(q->data);	98,162✔
51	q->data = NULL;	98,162✔
52	}	98,162✔
53
54	/**
55	* Resize the queue. make data array 50% larger.
56	* content of data array is unchanged
57	*/
58	static
59	void resize_queue(int_queue_t *q) {	2,987✔
60	uint32_t n;
61
62	n = q->capacity + 1;	2,987✔
63	n += n >> 1;	2,987✔
64
65	if (n > MAX_INT_QUEUE_CAPACITY) {	2,987✔
66	out_of_memory();	×
67	}
68
69	q->data = (int32_t ) safe_realloc(q->data, n sizeof(int32_t));	2,987✔
70	q->capacity = n;	2,987✔
71	}	2,987✔
72
73	/**
74	* Push element x at the end of the queue
75	*/
76	void int_queue_push(int_queue_t *q, int32_t x) {	1,555,570✔
77	uint32_t i, n, j;
78
79	i = q->tail;	1,555,570✔
80	q->data[i] = x;	1,555,570✔
81	i ++;	1,555,570✔
82	q->tail = i;	1,555,570✔
83
84	if (i == q->capacity) {	1,555,570✔
85	if (q->head == 0) {	30,603✔
86	/*
87	* full queue, stored in data[0...size-1],
88	* just increase the size
89	*/
90	resize_queue(q);	29✔
91	} else {
92	q->tail = 0;	30,574✔
93	}
94	} else if (i == q->head) {	1,524,967✔
95	/*
96	* full queue, stored in data[0..i-1][head .. size-1]
97	* increase the size and shift data[head .. size - 1] to the end
98	* of the new data array.
99	*/
100	n = q->capacity;	2,958✔
101	resize_queue(q);	2,958✔
102	j = q->capacity;	2,958✔
103	do {
104	n --;	57,996✔
105	j --;	57,996✔
106	q->data[j] = q->data[n];	57,996✔
107	} while (n > i);	57,996✔
108	q->head = j;	2,958✔
109	}
110	}	1,555,570✔
111
112	/**
113	* Push a[0 ... n-1] in the queue (in this order)
114	*/
115	void int_queue_push_array(int_queue_t q, int32_t a, uint32_t n) {	5,299✔
116	uint32_t i;
117
118	for (i=0; i<n; i++) {	19,513✔
119	int_queue_push(q, a[i]);	14,214✔
120	}
121	}	5,299✔
122
123	/**
124	* Return first element and remove it
125	*/
126	int32_t int_queue_pop(int_queue_t *q) {	1,543,469✔
127	uint32_t h;
128	int32_t x;
129
130	assert(q->head != q->tail);
131
132	h = q->head;	1,543,469✔
133	x = q->data[h];	1,543,469✔
134	h ++;	1,543,469✔
135	if (h >= q->capacity) h = 0;	1,543,469✔
136	q->head = h;	1,543,469✔
137
138	return x;	1,543,469✔
139	}
140
141	/**
142	* Get the first element (don't remove it).
143	*/
NEW 144	int32_t int_queue_first(const int_queue_t *q) {	×
145	assert(q->head != q->tail);
146	return q->data[q->head];	×
147	}
148
149	/**
150	* Get the last element (don't remove it)
151	*/
NEW 152	int32_t int_queue_last(const int_queue_t *q) {	×
153	uint32_t i;
154
155	assert(q->head != q->tail);
156	i = q->tail;	×
157	if (i == 0) {	×
NEW 158	i = q->capacity;	×
159	}
160	assert(i > 0);
161	return q->data[i-1];	×
162	}
163
164	/**
165	* Get element at position i
166	*/
NEW 167	int32_t int_queue_at(const int_queue_t *q, uint32_t i) {	×
168	assert(q->head != q->tail);
169
NEW 170	if (q->head < q->tail) {	×
171	assert(q->head + i < q->tail);
NEW 172	return q->data[q->head + i];	×
NEW 173	} else if (q->head > q->tail) {	×
NEW 174	uint32_t size_first = q->capacity - q->head;	×
175	assert(i < size_first \|\| i - size_first < q->tail);
176	return i < size_first
NEW 177	? q->data[q->head + i]	×
NEW 178	: q->data[i - size_first];	×
179	}
180
181	assert(false);
NEW 182	return 0;	×
183	}
184
185	/**
186	* Get size of queue
187	*/
188	uint32_t int_queue_size(const int_queue_t *q) {	535✔
189	if (q->head <= q->tail) {	535✔
190	return q->tail - q->head;	535✔
191	} else {
NEW 192	return (q->capacity - q->head) + q->tail;	×
193	}
194	}

SRI-CSL / yices2 / 8303521702

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous