Mercurial > hg > Members > kono > jpf-core
view src/main/gov/nasa/jpf/vm/choice/DoubleChoiceFromSet.java @ 22:cd7880ab73c7
fixed JPF_.._Verify.registerChoiceGenerator() to not break and ignore the
transition if there are no choices, but to just return the provided default
value. Thanks to Pascal Kessell for reporting
added a .include_null option for the TypedObjectChoice CG. If it is set
(default) 'null' is included in the choice set
added a dedicated reg test for TypedObjectChoice, removed the one in
DataChoiceTest
author | Peter Mehlitz <pcmehlitz@gmail.com> |
---|---|
date | Tue, 14 Apr 2015 15:01:25 -0700 |
parents | 61d41facf527 |
children |
line wrap: on
line source
/* * Copyright (C) 2014, United States Government, as represented by the * Administrator of the National Aeronautics and Space Administration. * All rights reserved. * * The Java Pathfinder core (jpf-core) platform is licensed under the * Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0. * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package gov.nasa.jpf.vm.choice; import gov.nasa.jpf.Config; public class DoubleChoiceFromSet extends DoubleChoiceFromList { public DoubleChoiceFromSet (Config conf, String id) { super(conf, id); } public DoubleChoiceFromSet(String id, double... val){ super(id, val); removeDuplicates(); count = -1; } /** super constructor for subclasses that want to configure themselves * * @param id name used in choice config */ protected DoubleChoiceFromSet(String id){ super(id); } /* * Remove duplicate values. This is pretty redundant to IntChoiceFromSet, but * unfortunately we rely on boxing/unboxing and array creation, for which the compiler * needs the concrete type */ private void removeDuplicates() { int len = values.length; for (int i = 0; i < len; i++) { int j = i + 1; while (j < len) { if (values[i] == values[j]) { values[j] = values[len - 1]; len--; // don't increment j as new element has been placed there and needs to be re-tested } else { j++; } } } if (len < values.length) { Double[] uniqVals = new Double[len]; System.arraycopy(values, 0, uniqVals, 0, len); values = uniqVals; } } }