TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 23:36:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hneemann/Digital

Browse Source
This commit is contained in:
hneemann 2019-03-05 11:47:55 +01:00
commit 42e2ccd131
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/analyse/MinimizerQuineMcCluskeyExam.java
View File

@ -20,7 +20,7 @@ import java.util.List;
/**
* The QMC-Minimizer used for exam correction.
* Should only be used if there are not more then 4 variables.
* Should only be used if there are not more than 4 variables.
*/
public class MinimizerQuineMcCluskeyExam extends MinimizerQuineMcCluskey {

2
src/main/java/de/neemann/digital/analyse/quinemc/QuineMcCluskeyExam.java
View File

@ -20,7 +20,7 @@ import java.util.TreeSet;
* Needed for exam correction.
* It does not throw away all primes which are not necessary but tries to find the primes
* which are necessary. So is is possible to find all possible solutions.
* Works only if there are not more then 4 variables.
* Works only if there are not more than 4 variables.
* <p>
*/
public class QuineMcCluskeyExam extends QuineMcCluskey {

2
src/main/java/de/neemann/digital/core/BurnException.java
View File

@ -10,7 +10,7 @@ import java.util.HashSet;
import java.util.Set;
/**
* Is thrown if more then one output of a set of connected outputs becomes active
* Is thrown if more than one output of a set of connected outputs becomes active
*/
public class BurnException extends RuntimeException implements ExceptionWithOriginInterface {
private final ObservableValues values;

2
src/main/java/de/neemann/digital/core/SpeedTest.java
View File

@ -39,7 +39,7 @@ public class SpeedTest {
if (clocks.isEmpty())
throw new NodeException(Lang.get("err_noClockFound"));
else if (clocks.size() > 1)
throw new NodeException(Lang.get("err_moreThenOneClocksFound"));
throw new NodeException(Lang.get("err_moreThanOneClockFound"));
Clock clock = clocks.get(0);

2
src/main/java/de/neemann/digital/core/wiring/bus/DataBus.java
View File

@ -19,7 +19,7 @@ import java.util.ArrayList;
* Handles the creation of a data bus.
* Is needed to connect multiple outputs which can become high Z.
* If one of the output becomes low Z, this value is returned by the {@link ObservableValue}
* created by this bus. If more then one output becomes low Z and the values are not equal then
* created by this bus. If more than one output becomes low Z and the values are not equal then
* a {@link de.neemann.digital.core.BurnException} is thrown after the models step is completed.
* During the calculation of of a single step a temporary burn condition is allowed.
*/

2
src/main/java/de/neemann/digital/draw/model/Net.java
View File

@ -141,7 +141,7 @@ public class Net {
* All inputs and outputs in the net are connected together.
* If there is no output an exception is thrown.
* If there is one single output, all input {@link ObservableValue}s are set to this output
* If there are more then one output a {@link DataBus} is created.
* If there is more than one output, a {@link DataBus} is created.
* <p>
* At the end all wires get a reference to the {@link ObservableValue} the represent
*

2
src/main/resources/lang/lang_de.xml
View File

@ -857,7 +857,7 @@
<string name="err_invalidFileFormat">Ungültiges Dateiformat</string>
<string name="err_isAlreadyInitialized">Die Schaltung wurde bereits initialisiert</string>
<string name="err_labelNotConnectedToNet_N">Ein Tunnel {0} ist nicht verbunden!</string>
<string name="err_moreThenOneClocksFound">Es gibt mehr als einen Taktgeber</string>
<string name="err_moreThanOneClockFound">Es gibt mehr als einen Taktgeber</string>
<string name="err_needs_N0_bits_found_N2_bits">Es werden {0} Bits benötigt, jedoch wurden {1} Bits gefunden</string>
<string name="err_netOfPin_N_notFound">Das Netz von Pin {0} wurde nicht gefunden</string>
<string name="err_noClockFound">Kein Taktgeber in der Schaltung gefunden</string>

6
src/main/resources/lang/lang_en.xml
View File

@ -840,7 +840,7 @@
<string name="err_builder_exprNotSupported">Expression {0} not supported</string>
<string name="err_builder_operationNotSupported">Operation {0} not supported</string>
<string name="err_builder_couldNotFillLUT">Error creating the lookup table.</string>
<string name="err_burnError">More then one output is active on a wire, causing a short circuit.</string>
<string name="err_burnError">More than one output is active on a wire, causing a short circuit.</string>
<string name="err_pullUpAndDown">It is not allowed to connect a pull-up and pull-down resistor to the same net.</string>
<string name="err_cannotAnalyse_N">Cannot analyse Node {0}</string>
<string name="err_containsVarAndNotVar">Contains [var] and [not var]</string>
@ -851,7 +851,7 @@
<string name="err_invalidFileFormat">Invalid file format</string>
<string name="err_isAlreadyInitialized">Logic is already initialized</string>
<string name="err_labelNotConnectedToNet_N">A tunnel {0} is not connected!</string>
<string name="err_moreThenOneClocksFound">There are more then one clock</string>
<string name="err_moreThanOneClockFound">There is more than one clock</string>
<string name="err_needs_N0_bits_found_N2_bits">There are {0} bits needed, but {1} bits found</string>
<string name="err_netOfPin_N_notFound">Net of pin {0} not found</string>
<string name="err_noClockFound">No clock found in logic</string>
@ -922,7 +922,7 @@
<string name="err_diodeNeedsPullDownResistorAtOutput">Diode needs a pull down resistor at its output!</string>
<string name="err_testSignal_N_notFound">Test signal {0} not found in the circuit!</string>
<string name="err_toManyBits_Found_N0_maxIs_N1">Only {1} bits allowed, but {0} bits found!</string>
<string name="err_MultiBitFlipFlopFound">Flip-flops with more then one bits are not allowed!</string>
<string name="err_MultiBitFlipFlopFound">Flip-flops with more than one bit are not allowed!</string>
<string name="err_invalidTransmissionGateState">The two control inputs of a transmission gate must be inverted!</string>
<string name="err_nameUsedTwice_N">Signal {0} is used twice!</string>
<string name="err_errorParsingTestdata">Error parsing the test data.</string>

2
src/main/resources/lang/lang_pt.xml
View File

@ -832,7 +832,7 @@
<string name="err_invalidFileFormat">Formato de arquivo inválido</string>
<string name="err_isAlreadyInitialized">A lógica já está inicializada</string>
<string name="err_labelNotConnectedToNet_N">Um túnel {0} não está conectado!</string>
<string name="err_moreThenOneClocksFound">Há mais de um clock</string>
<string name="err_moreThanOneClockFound">Há mais de um clock</string>
<string name="err_needs_N0_bits_found_N2_bits">Necessários {0} bits, mas {1} bits encontrados</string>
<string name="err_netOfPin_N_notFound">A rede de pino {0} não encontrada</string>
<string name="err_noClockFound">Nenhum clock encontrado</string>

2
src/main/resources/lang/lang_pt_ref.xml
View File

@ -835,7 +835,7 @@
<string name="err_invalidFileFormat">Invalid file format</string>
<string name="err_isAlreadyInitialized">Logic is already initialized</string>
<string name="err_labelNotConnectedToNet_N">A tunnel {0} is not connected!</string>
<string name="err_moreThenOneClocksFound">There are more then one clock</string>
<string name="err_moreThanOneClockFound">There are more then one clock</string>
<string name="err_needs_N0_bits_found_N2_bits">There are {0} bits needed, but {1} bits found</string>
<string name="err_netOfPin_N_notFound">Net of pin {0} not found</string>
<string name="err_noClockFound">No clock found in logic</string>

2
src/test/java/de/neemann/digital/analyse/quinemc/MinimizerRegressionTest.java
View File

@ -56,7 +56,7 @@ public class MinimizerRegressionTest extends TestCase {
/**
* for more then 3 variables we only test some random tables
* for more than 3 variables we only test some random tables
*
* @throws ExpressionException
*/

2
src/test/java/de/neemann/digital/integration/ToBreakRunner.java
View File

@ -110,7 +110,7 @@ public class ToBreakRunner {
/**
* Returns single node of the given class.
* If there more then one maching node, an exception is thrown.
* If there is more than one maching node, an exception is thrown.
*
* @param clazz the class
* @param <T> the type of the node

2
src/test/resources/docu/static_en.xml
View File

@ -476,7 +476,7 @@
</answer>
</faq>
<faq>
<question>I have entered a truth table, but there is more then one boolean equation shown.
<question>I have entered a truth table, but there is more than one boolean equation shown.
Which of them is the correct one?
</question>
<answer>Minimizing a boolean equation can result in many equations, describing the same function.