forked from Blendman974/faceclaw
Merge branch 'main' into ble-bandwidth-test
This commit is contained in:
commit
0114c521ad
316 files changed
+32980
-882
No files matched your search
@@ -0,0 +1,40 @@
|
|||||||
|
name: Deploy website
|
||||||
|
|
||||||
|
# Publishes website/ to GitHub Pages. Requires the repository's
|
||||||
|
# Settings > Pages > Source to be set to "GitHub Actions".
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- 'website/**'
|
||||||
|
- 'PRIVACY'
|
||||||
|
- 'scripts/sync-site.mjs'
|
||||||
|
- '.github/workflows/pages.yml'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pages: write
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: pages
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
environment:
|
||||||
|
name: github-pages
|
||||||
|
url: ${{ steps.deployment.outputs.page_url }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Check generated blocks are up to date
|
||||||
|
run: node scripts/sync-site.mjs --check
|
||||||
|
- uses: actions/configure-pages@v5
|
||||||
|
- uses: actions/upload-pages-artifact@v3
|
||||||
|
with:
|
||||||
|
path: website
|
||||||
|
- id: deployment
|
||||||
|
uses: actions/deploy-pages@v4
|
||||||
+2
-2
@@ -41,5 +41,5 @@ old
|
|||||||
faceclaw_settings.xml
|
faceclaw_settings.xml
|
||||||
|
|
||||||
# Developer configs
|
# Developer configs
|
||||||
build.sh
|
build_paths.sh
|
||||||
build_and_run.sh
|
|
||||||
@@ -12,6 +12,13 @@ dependencies {
|
|||||||
// code" entry. Scanner UI and camera live in Play Services, so Faceclaw
|
// code" entry. Scanner UI and camera live in Play Services, so Faceclaw
|
||||||
// needs no camera permission and no third-party scanner app.
|
// needs no camera permission and no third-party scanner app.
|
||||||
implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
|
implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
|
||||||
|
// Wearable Data Layer (MessageClient / DataClient / CapabilityClient) for
|
||||||
|
// the Wear OS watch remote; see FaceclawWearBridge and wear/.
|
||||||
|
implementation 'com.google.android.gms:play-services-wearable:19.0.0'
|
||||||
|
// On-device language identification and translation for the Microphones
|
||||||
|
// app's captions (translation models download on demand, per language).
|
||||||
|
implementation 'com.google.mlkit:language-id:17.0.6'
|
||||||
|
implementation 'com.google.mlkit:translate:17.0.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
def faceclawSherpaOnnxVersion = "1.13.0"
|
def faceclawSherpaOnnxVersion = "1.13.0"
|
||||||
|
|||||||
@@ -77,6 +77,7 @@
|
|||||||
android:name="com.tns.NativeScriptActivity"
|
android:name="com.tns.NativeScriptActivity"
|
||||||
android:label="@string/title_activity_kimera"
|
android:label="@string/title_activity_kimera"
|
||||||
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
|
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
|
||||||
|
android:windowSoftInputMode="adjustResize"
|
||||||
android:theme="@style/LaunchScreenTheme"
|
android:theme="@style/LaunchScreenTheme"
|
||||||
android:hardwareAccelerated="true"
|
android:hardwareAccelerated="true"
|
||||||
android:launchMode="singleTask"
|
android:launchMode="singleTask"
|
||||||
@@ -110,9 +111,34 @@
|
|||||||
<action android:name="android.service.notification.NotificationListenerService" />
|
<action android:name="android.service.notification.NotificationListenerService" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</service>
|
</service>
|
||||||
|
<!-- Wear OS: Play services routes watch-app messages (paths under
|
||||||
|
/faceclaw) and watch reachability changes here, starting the app
|
||||||
|
process if needed. See FaceclawWearBridge. -->
|
||||||
|
<service
|
||||||
|
android:name="com.faceclaw.app.FaceclawWearListenerService"
|
||||||
|
android:enabled="true"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
|
||||||
|
<data android:scheme="wear" android:host="*" android:pathPrefix="/faceclaw" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.google.android.gms.wearable.CAPABILITY_CHANGED" />
|
||||||
|
<data android:scheme="wear" android:host="*" android:pathPrefix="/" />
|
||||||
|
</intent-filter>
|
||||||
|
</service>
|
||||||
<receiver
|
<receiver
|
||||||
android:name="com.faceclaw.app.FaceclawTimerReceiver"
|
android:name="com.faceclaw.app.FaceclawTimerReceiver"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
<!-- adb-only settings export/import (see FaceclawSettingsPortReceiver).
|
||||||
|
DUMP is a development permission: the adb shell holds it, other
|
||||||
|
apps cannot get it granted without adb, so this stays reachable
|
||||||
|
from the command line but not from apps on the phone. -->
|
||||||
|
<receiver
|
||||||
|
android:name="com.faceclaw.app.FaceclawSettingsPortReceiver"
|
||||||
|
android:enabled="true"
|
||||||
|
android:exported="true"
|
||||||
|
android:permission="android.permission.DUMP" />
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
@@ -0,0 +1,242 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.media.MediaCodec;
|
||||||
|
import android.media.MediaCodecInfo;
|
||||||
|
import android.media.MediaFormat;
|
||||||
|
import android.media.MediaMuxer;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.ByteOrder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transcodes a 16-bit PCM WAV conversation recording into AAC-LC in an M4A
|
||||||
|
* container, cutting speech recordings to roughly a tenth of their WAV size.
|
||||||
|
* Runs on its own thread; the source WAV is deleted on success when requested.
|
||||||
|
*/
|
||||||
|
public class FaceclawAudioTranscoder {
|
||||||
|
private static final String TAG = "FaceclawTranscode";
|
||||||
|
private static final long CODEC_TIMEOUT_US = 10_000;
|
||||||
|
|
||||||
|
public interface Listener {
|
||||||
|
void onDone(String outputPath, long outputBytes);
|
||||||
|
|
||||||
|
void onError(String message);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final String wavPath;
|
||||||
|
private final String outputPath;
|
||||||
|
private final int bitrateBps;
|
||||||
|
private final boolean deleteSourceOnSuccess;
|
||||||
|
private final Listener listener;
|
||||||
|
|
||||||
|
public FaceclawAudioTranscoder(
|
||||||
|
String wavPath,
|
||||||
|
String outputPath,
|
||||||
|
int bitrateBps,
|
||||||
|
boolean deleteSourceOnSuccess,
|
||||||
|
Listener listener) {
|
||||||
|
this.wavPath = wavPath;
|
||||||
|
this.outputPath = outputPath;
|
||||||
|
this.bitrateBps = bitrateBps > 0 ? bitrateBps : 32_000;
|
||||||
|
this.deleteSourceOnSuccess = deleteSourceOnSuccess;
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void start() {
|
||||||
|
Thread thread = new Thread(this::run, "FaceclawTranscode");
|
||||||
|
thread.setPriority(Thread.MIN_PRIORITY);
|
||||||
|
thread.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void run() {
|
||||||
|
try {
|
||||||
|
transcode();
|
||||||
|
long size = new File(outputPath).length();
|
||||||
|
if (deleteSourceOnSuccess) {
|
||||||
|
new File(wavPath).delete();
|
||||||
|
}
|
||||||
|
if (listener != null) {
|
||||||
|
listener.onDone(outputPath, size);
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "transcode failed for " + wavPath, t);
|
||||||
|
new File(outputPath).delete();
|
||||||
|
if (listener != null) {
|
||||||
|
listener.onError(t.getMessage() == null ? t.toString() : t.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void transcode() throws IOException {
|
||||||
|
WavInfo wav = readWavHeader(wavPath);
|
||||||
|
MediaFormat format = MediaFormat.createAudioFormat(
|
||||||
|
MediaFormat.MIMETYPE_AUDIO_AAC, wav.sampleRate, wav.channels);
|
||||||
|
format.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
|
||||||
|
format.setInteger(MediaFormat.KEY_BIT_RATE, bitrateBps);
|
||||||
|
format.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, 16 * 1024);
|
||||||
|
|
||||||
|
MediaCodec codec = MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_AUDIO_AAC);
|
||||||
|
MediaMuxer muxer = null;
|
||||||
|
FileInputStream input = null;
|
||||||
|
try {
|
||||||
|
codec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
|
||||||
|
codec.start();
|
||||||
|
muxer = new MediaMuxer(outputPath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
|
||||||
|
input = new FileInputStream(wavPath);
|
||||||
|
long skipped = 0;
|
||||||
|
while (skipped < wav.dataOffset) {
|
||||||
|
long step = input.skip(wav.dataOffset - skipped);
|
||||||
|
if (step <= 0) {
|
||||||
|
throw new IOException("could not seek past WAV header");
|
||||||
|
}
|
||||||
|
skipped += step;
|
||||||
|
}
|
||||||
|
|
||||||
|
MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
|
||||||
|
byte[] chunk = new byte[8192];
|
||||||
|
int track = -1;
|
||||||
|
boolean muxerStarted = false;
|
||||||
|
boolean inputDone = false;
|
||||||
|
boolean outputDone = false;
|
||||||
|
long remaining = wav.dataBytes;
|
||||||
|
long presentationUs = 0;
|
||||||
|
long bytesPerSecond = (long) wav.sampleRate * wav.channels * 2;
|
||||||
|
|
||||||
|
while (!outputDone) {
|
||||||
|
if (!inputDone) {
|
||||||
|
int inIndex = codec.dequeueInputBuffer(CODEC_TIMEOUT_US);
|
||||||
|
if (inIndex >= 0) {
|
||||||
|
ByteBuffer inBuf = codec.getInputBuffer(inIndex);
|
||||||
|
int wanted = (int) Math.min(chunk.length, Math.min(remaining, inBuf.capacity()));
|
||||||
|
int read = wanted > 0 ? input.read(chunk, 0, wanted) : -1;
|
||||||
|
if (read <= 0) {
|
||||||
|
codec.queueInputBuffer(inIndex, 0, 0, presentationUs,
|
||||||
|
MediaCodec.BUFFER_FLAG_END_OF_STREAM);
|
||||||
|
inputDone = true;
|
||||||
|
} else {
|
||||||
|
inBuf.clear();
|
||||||
|
inBuf.put(chunk, 0, read);
|
||||||
|
codec.queueInputBuffer(inIndex, 0, read, presentationUs, 0);
|
||||||
|
remaining -= read;
|
||||||
|
presentationUs += read * 1_000_000L / bytesPerSecond;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int outIndex = codec.dequeueOutputBuffer(info, CODEC_TIMEOUT_US);
|
||||||
|
if (outIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
|
||||||
|
track = muxer.addTrack(codec.getOutputFormat());
|
||||||
|
muxer.start();
|
||||||
|
muxerStarted = true;
|
||||||
|
} else if (outIndex >= 0) {
|
||||||
|
if (info.size > 0 && (info.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) == 0) {
|
||||||
|
if (!muxerStarted) {
|
||||||
|
throw new IOException("encoder produced data before format");
|
||||||
|
}
|
||||||
|
ByteBuffer outBuf = codec.getOutputBuffer(outIndex);
|
||||||
|
outBuf.position(info.offset);
|
||||||
|
outBuf.limit(info.offset + info.size);
|
||||||
|
muxer.writeSampleData(track, outBuf, info);
|
||||||
|
}
|
||||||
|
codec.releaseOutputBuffer(outIndex, false);
|
||||||
|
if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
|
||||||
|
outputDone = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (input != null) {
|
||||||
|
try {
|
||||||
|
input.close();
|
||||||
|
} catch (IOException ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
codec.stop();
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
}
|
||||||
|
codec.release();
|
||||||
|
if (muxer != null) {
|
||||||
|
try {
|
||||||
|
muxer.stop();
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
}
|
||||||
|
muxer.release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final class WavInfo {
|
||||||
|
int sampleRate;
|
||||||
|
int channels;
|
||||||
|
long dataOffset;
|
||||||
|
long dataBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Minimal RIFF walk: locates fmt and data chunks, 16-bit PCM only. */
|
||||||
|
private static WavInfo readWavHeader(String path) throws IOException {
|
||||||
|
try (FileInputStream in = new FileInputStream(path)) {
|
||||||
|
byte[] head = new byte[12];
|
||||||
|
if (in.read(head) != 12 || head[0] != 'R' || head[1] != 'I' || head[8] != 'W') {
|
||||||
|
throw new IOException("not a WAV file");
|
||||||
|
}
|
||||||
|
WavInfo info = new WavInfo();
|
||||||
|
long offset = 12;
|
||||||
|
byte[] chunkHead = new byte[8];
|
||||||
|
while (in.read(chunkHead) == 8) {
|
||||||
|
ByteBuffer b = ByteBuffer.wrap(chunkHead).order(ByteOrder.LITTLE_ENDIAN);
|
||||||
|
int id = b.getInt();
|
||||||
|
long size = b.getInt() & 0xffffffffL;
|
||||||
|
offset += 8;
|
||||||
|
if (id == 0x20746d66) { // "fmt "
|
||||||
|
byte[] fmt = new byte[(int) Math.min(size, 16)];
|
||||||
|
if (in.read(fmt) != fmt.length) {
|
||||||
|
throw new IOException("truncated fmt chunk");
|
||||||
|
}
|
||||||
|
ByteBuffer f = ByteBuffer.wrap(fmt).order(ByteOrder.LITTLE_ENDIAN);
|
||||||
|
int audioFormat = f.getShort();
|
||||||
|
info.channels = f.getShort();
|
||||||
|
info.sampleRate = f.getInt();
|
||||||
|
f.getInt();
|
||||||
|
f.getShort();
|
||||||
|
int bits = f.getShort();
|
||||||
|
if (audioFormat != 1 || bits != 16) {
|
||||||
|
throw new IOException("only 16-bit PCM WAV is supported");
|
||||||
|
}
|
||||||
|
long skip = size - fmt.length;
|
||||||
|
while (skip > 0) {
|
||||||
|
long step = in.skip(skip);
|
||||||
|
if (step <= 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
skip -= step;
|
||||||
|
}
|
||||||
|
offset += size;
|
||||||
|
} else if (id == 0x61746164) { // "data"
|
||||||
|
info.dataOffset = offset;
|
||||||
|
// A zero size means the header was never patched (crash
|
||||||
|
// mid-recording); recover the length from the file size.
|
||||||
|
info.dataBytes = size > 0 ? size : new File(path).length() - offset;
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
long skip = size;
|
||||||
|
while (skip > 0) {
|
||||||
|
long step = in.skip(skip);
|
||||||
|
if (step <= 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
skip -= step;
|
||||||
|
}
|
||||||
|
offset += size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (info.sampleRate == 0 || info.dataOffset == 0) {
|
||||||
|
throw new IOException("missing fmt or data chunk");
|
||||||
|
}
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -60,6 +60,9 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
|||||||
new java.util.concurrent.CopyOnWriteArrayList<>();
|
new java.util.concurrent.CopyOnWriteArrayList<>();
|
||||||
private final java.util.List<FaceclawCompassListener> compassListeners =
|
private final java.util.List<FaceclawCompassListener> compassListeners =
|
||||||
new java.util.concurrent.CopyOnWriteArrayList<>();
|
new java.util.concurrent.CopyOnWriteArrayList<>();
|
||||||
|
private final java.util.List<FaceclawMicStatusListener> micStatusListeners =
|
||||||
|
new java.util.concurrent.CopyOnWriteArrayList<>();
|
||||||
|
private volatile String lastFirmwareCapabilities = "";
|
||||||
private volatile Thread workerThread;
|
private volatile Thread workerThread;
|
||||||
private volatile boolean running;
|
private volatile boolean running;
|
||||||
private volatile boolean userDisconnectRequested;
|
private volatile boolean userDisconnectRequested;
|
||||||
@@ -389,6 +392,19 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the glasses mic is enabled right now. The enable lives in the
|
||||||
|
* current EvenHub session, so it dies with a transport drop, the charging
|
||||||
|
* case, or a suspend — silently, from the phone's point of view. Callers
|
||||||
|
* that track a capture across those events must check this rather than
|
||||||
|
* assume their earlier enable still holds.
|
||||||
|
*/
|
||||||
|
public boolean isAudioCaptureActive() {
|
||||||
|
synchronized (lock) {
|
||||||
|
return running && sessionReady && !shutdownRequested && audioCaptureActive;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Acquire/renew or release CFW's volatile wake-takeover lease on both
|
* Acquire/renew or release CFW's volatile wake-takeover lease on both
|
||||||
* arms. Delivery (not a protocol ACK) is awaited so a caller can ensure
|
* arms. Delivery (not a protocol ACK) is awaited so a caller can ensure
|
||||||
@@ -743,6 +759,98 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The CFW capability token string from the last firmware-info read ("" before one arrives). */
|
||||||
|
public String getFirmwareCapabilities() {
|
||||||
|
return lastFirmwareCapabilities;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addMicStatusListener(FaceclawMicStatusListener listener) {
|
||||||
|
if (listener != null) {
|
||||||
|
micStatusListeners.add(listener);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void removeMicStatusListener(FaceclawMicStatusListener listener) {
|
||||||
|
if (listener != null) {
|
||||||
|
micStatusListeners.remove(listener);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitMicStatus(byte[] body, String address) {
|
||||||
|
if (micStatusListeners.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String arm = address.equalsIgnoreCase(leftAddress) ? "L"
|
||||||
|
: address.equalsIgnoreCase(rightAddress) ? "R" : "?";
|
||||||
|
byte[] copy = java.util.Arrays.copyOf(body, body.length);
|
||||||
|
mainHandler.post(() -> {
|
||||||
|
for (FaceclawMicStatusListener micListener : micStatusListeners) {
|
||||||
|
try {
|
||||||
|
micListener.onMicStatus(copy, arm);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "mic status listener failed", t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Queue a CFW mic_control record (['M','C',ver,op,...]) as a settings
|
||||||
|
* field-103 write to both temples, or to a single one. Fire-and-forget:
|
||||||
|
* the firmware answers with a field-104 status notify per temple, which
|
||||||
|
* arrives through addMicStatusListener.
|
||||||
|
*/
|
||||||
|
public void sendFaceclawMicControl(byte[] record, String label, boolean rightTemple, boolean leftTemple) {
|
||||||
|
if (record == null || record.length < 4) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
synchronized (lock) {
|
||||||
|
if (!running || !sessionReady) {
|
||||||
|
logLine("skip mic control (" + label + "); session not ready");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (rightTemple) {
|
||||||
|
pendingMessages.addLast(messageBuilder.faceclawMicControl(record, label, false));
|
||||||
|
}
|
||||||
|
if (leftTemple) {
|
||||||
|
pendingMessages.addLast(messageBuilder.faceclawMicControl(record, label, true));
|
||||||
|
}
|
||||||
|
logLine("queue mic control " + label);
|
||||||
|
}
|
||||||
|
interruptibleSleep.interrupt();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Forward render-characteristic audio packets to the listener WITHOUT
|
||||||
|
* sending the stock EvenHub audio-control enable. Used for the CFW
|
||||||
|
* mic_control streaming path, where capture is armed through settings
|
||||||
|
* field 103 and the temples emit 'SM' frames on the same characteristic
|
||||||
|
* that stock mono LC3 uses. Returns false when no session is up.
|
||||||
|
*/
|
||||||
|
public boolean startG2AudioForwarding(FaceclawAudioPacketListener listener) {
|
||||||
|
if (listener == null) {
|
||||||
|
throw new IllegalArgumentException("listener is required");
|
||||||
|
}
|
||||||
|
synchronized (lock) {
|
||||||
|
if (!running || !sessionReady || shutdownRequested) {
|
||||||
|
logLine("skip G2 audio forwarding; session not ready");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
audioPacketListener = listener;
|
||||||
|
audioCaptureActive = true;
|
||||||
|
logLine("G2 audio forwarding enabled");
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void stopG2AudioForwarding() {
|
||||||
|
synchronized (lock) {
|
||||||
|
audioPacketListener = null;
|
||||||
|
audioCaptureActive = false;
|
||||||
|
logLine("G2 audio forwarding disabled");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void addCompassListener(FaceclawCompassListener listener) {
|
public void addCompassListener(FaceclawCompassListener listener) {
|
||||||
if (listener != null) {
|
if (listener != null) {
|
||||||
compassListeners.add(listener);
|
compassListeners.add(listener);
|
||||||
@@ -777,12 +885,17 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
|||||||
* foreground), including worker-app frames the TS side never sees.
|
* foreground), including worker-app frames the TS side never sees.
|
||||||
*/
|
*/
|
||||||
public android.graphics.Bitmap getCompositePreviewBitmap(double brightenGamma) {
|
public android.graphics.Bitmap getCompositePreviewBitmap(double brightenGamma) {
|
||||||
|
return getCompositePreviewBitmap(brightenGamma, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** As above; `green` renders the preview green-on-black (Settings > Phone display > Preview color). */
|
||||||
|
public android.graphics.Bitmap getCompositePreviewBitmap(double brightenGamma, boolean green) {
|
||||||
SurfaceCompositor.Composite composite = compositor.previewComposite();
|
SurfaceCompositor.Composite composite = compositor.previewComposite();
|
||||||
if (composite == null) {
|
if (composite == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return PreviewBitmapUtil.fromGray(
|
return PreviewBitmapUtil.fromGray(
|
||||||
java.nio.ByteBuffer.wrap(composite.gray), composite.width, composite.height, brightenGamma);
|
java.nio.ByteBuffer.wrap(composite.gray), composite.width, composite.height, brightenGamma, green);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Save the current composite as a 4-bit grayscale PNG; returns the path or "". */
|
/** Save the current composite as a 4-bit grayscale PNG; returns the path or "". */
|
||||||
@@ -1433,6 +1546,16 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
|||||||
0
|
0
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if (!faceclawWakeNotification
|
||||||
|
&& frame.ok
|
||||||
|
&& frame.sid == BleProtocol.SID_UI_SETTING) {
|
||||||
|
// CFW mic status (field 104) rides both standalone pushes and
|
||||||
|
// settings read acks, from each temple on its own link.
|
||||||
|
byte[] micStatus = BleProtocol.parseFaceclawMicStatus(frame.pb);
|
||||||
|
if (micStatus != null) {
|
||||||
|
emitMicStatus(micStatus, address);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!faceclawWakeNotification
|
if (!faceclawWakeNotification
|
||||||
&& decodedWearState < 0
|
&& decodedWearState < 0
|
||||||
&& frame.ok
|
&& frame.ok
|
||||||
@@ -2716,6 +2839,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
|||||||
}
|
}
|
||||||
BleProtocol.FirmwareInfo firmwareInfo = BleProtocol.parseSettingsFirmwareInfo(message.ackPayload);
|
BleProtocol.FirmwareInfo firmwareInfo = BleProtocol.parseSettingsFirmwareInfo(message.ackPayload);
|
||||||
if (firmwareInfo != null) {
|
if (firmwareInfo != null) {
|
||||||
|
lastFirmwareCapabilities = firmwareInfo.capabilities == null ? "" : firmwareInfo.capabilities;
|
||||||
cfwCleanupSupported = hasCapability(firmwareInfo.capabilities, "cleanup11");
|
cfwCleanupSupported = hasCapability(firmwareInfo.capabilities, "cleanup11");
|
||||||
textureCacheSupported = hasCapability(firmwareInfo.capabilities, "texcache12")
|
textureCacheSupported = hasCapability(firmwareInfo.capabilities, "texcache12")
|
||||||
&& hasCapability(firmwareInfo.capabilities, "texstr14");
|
&& hasCapability(firmwareInfo.capabilities, "texstr14");
|
||||||
|
|||||||
@@ -0,0 +1,446 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.k2fsa.sherpa.onnx.FeatureConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineModelConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineMoonshineModelConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineRecognizer;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineRecognizerConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineRecognizerResult;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineStream;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.ArrayDeque;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Continuous captioning over the decoded mic PCM: segments speech into
|
||||||
|
* utterances with an adaptive energy gate, transcribes each utterance with
|
||||||
|
* the on-device Moonshine model, and attaches a speaker voice-print per
|
||||||
|
* utterance. PCM is pushed in from the TS side (which owns mic arbitration
|
||||||
|
* and any beam-direction gating), so this engine has no BLE dependencies.
|
||||||
|
*
|
||||||
|
* Utterance boundaries are measured on the sample clock, not the wall clock:
|
||||||
|
* BLE delivers mic packets in bursts, so elapsed real time overestimates the
|
||||||
|
* audio heard. The TS side converts startMs/endMs to wall-clock times using
|
||||||
|
* the engine start timestamp.
|
||||||
|
*/
|
||||||
|
public class FaceclawCaptionEngine {
|
||||||
|
private static final String TAG = "FaceclawCaptions";
|
||||||
|
private static final int SAMPLE_RATE = 16000;
|
||||||
|
private static final int FEATURE_DIM = 80;
|
||||||
|
private static final int MAX_QUEUE_PACKETS = 200;
|
||||||
|
|
||||||
|
// Segmentation: RMS thresholds relative to a rolling noise floor, in the
|
||||||
|
// same spirit as FaceclawVoiceController.EndpointDetector but recurring.
|
||||||
|
private static final double ONSET_FACTOR = 3.0;
|
||||||
|
private static final double RELEASE_FACTOR = 1.8;
|
||||||
|
private static final double MIN_RMS = 220.0;
|
||||||
|
private static final double NOISE_EMA_ALPHA = 0.05;
|
||||||
|
private static final int PRE_ROLL_MS = 400;
|
||||||
|
private static final int DEFAULT_SILENCE_MS = 800;
|
||||||
|
private static final int MIN_UTTERANCE_MS = 350;
|
||||||
|
private static final int MAX_UTTERANCE_MS = 15000;
|
||||||
|
// Moonshine v2 fails past ~9.1 s of input; decode long utterances in
|
||||||
|
// segments cut at the quietest window (mirrors FaceclawVoiceController).
|
||||||
|
private static final int DECODE_SEGMENT_MAX_SAMPLES = SAMPLE_RATE * 8;
|
||||||
|
private static final int CUT_SEARCH_SAMPLES = SAMPLE_RATE * 2;
|
||||||
|
private static final int CUT_WINDOW_SAMPLES = SAMPLE_RATE * 30 / 1000;
|
||||||
|
private static final float NORMALIZE_TARGET_PEAK = 0.9f;
|
||||||
|
private static final float NORMALIZE_MAX_GAIN = 30f;
|
||||||
|
// Voice-prints degrade on very long inputs; embed at most the first 10 s.
|
||||||
|
private static final int EMBED_MAX_SAMPLES = SAMPLE_RATE * 10;
|
||||||
|
|
||||||
|
private final Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||||
|
private final Object lock = new Object();
|
||||||
|
private final Object queueLock = new Object();
|
||||||
|
private final ArrayDeque<byte[]> queue = new ArrayDeque<>();
|
||||||
|
|
||||||
|
private volatile FaceclawCaptionEngineListener listener;
|
||||||
|
private volatile String asrModelDir;
|
||||||
|
private volatile String speakerModelPath;
|
||||||
|
private volatile int silenceMs = DEFAULT_SILENCE_MS;
|
||||||
|
private Thread workerThread;
|
||||||
|
private volatile boolean started;
|
||||||
|
|
||||||
|
private OfflineRecognizer recognizer;
|
||||||
|
private FaceclawSpeakerId speakerId;
|
||||||
|
|
||||||
|
// Segmentation state (worker thread only).
|
||||||
|
private long totalSamples;
|
||||||
|
private double noiseFloor;
|
||||||
|
private boolean inUtterance;
|
||||||
|
private long utteranceStartSample;
|
||||||
|
private long silenceRunSamples;
|
||||||
|
private double utterancePeakRms;
|
||||||
|
private short[] utterance = new short[SAMPLE_RATE * (MAX_UTTERANCE_MS / 1000)];
|
||||||
|
private int utteranceLength;
|
||||||
|
private final short[] preRoll = new short[SAMPLE_RATE * PRE_ROLL_MS / 1000];
|
||||||
|
private int preRollLength;
|
||||||
|
|
||||||
|
public void setListener(FaceclawCaptionEngineListener listener) {
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Directory holding the Moonshine model files, or null to disable ASR. */
|
||||||
|
public void setAsrModelDir(String dir) {
|
||||||
|
this.asrModelDir = dir;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Speaker-embedding ONNX model path, or null to disable voice-prints. */
|
||||||
|
public void setSpeakerModelPath(String path) {
|
||||||
|
this.speakerModelPath = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSilenceMs(int ms) {
|
||||||
|
this.silenceMs = Math.max(200, Math.min(3000, ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void start() {
|
||||||
|
synchronized (lock) {
|
||||||
|
if (started) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
started = true;
|
||||||
|
workerThread = new Thread(this::runLoop, "FaceclawCaptionEngine");
|
||||||
|
workerThread.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void stop() {
|
||||||
|
Thread threadToJoin;
|
||||||
|
synchronized (lock) {
|
||||||
|
if (!started) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
started = false;
|
||||||
|
threadToJoin = workerThread;
|
||||||
|
workerThread = null;
|
||||||
|
}
|
||||||
|
synchronized (queueLock) {
|
||||||
|
queueLock.notifyAll();
|
||||||
|
}
|
||||||
|
if (threadToJoin != null) {
|
||||||
|
threadToJoin.interrupt();
|
||||||
|
if (Thread.currentThread() != threadToJoin) {
|
||||||
|
try {
|
||||||
|
threadToJoin.join(2000);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Push decoded 16 kHz mono S16LE PCM (any chunking). */
|
||||||
|
public void acceptPcm(byte[] pcm16le) {
|
||||||
|
if (!started || pcm16le == null || pcm16le.length < 2) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
synchronized (queueLock) {
|
||||||
|
if (queue.size() >= MAX_QUEUE_PACKETS) {
|
||||||
|
queue.removeFirst();
|
||||||
|
}
|
||||||
|
queue.addLast(pcm16le);
|
||||||
|
queueLock.notifyAll();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void runLoop() {
|
||||||
|
try {
|
||||||
|
loadModels();
|
||||||
|
resetSegmentation();
|
||||||
|
while (started && !Thread.currentThread().isInterrupted()) {
|
||||||
|
byte[] chunk = takeChunk();
|
||||||
|
if (chunk == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
processChunk(chunk);
|
||||||
|
}
|
||||||
|
// Flush a trailing utterance so its text isn't lost on stop.
|
||||||
|
if (inUtterance && utteranceLength > 0) {
|
||||||
|
finalizeUtterance();
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.e(TAG, "caption engine failed", t);
|
||||||
|
emitStatus("Captions failed: " + t.getMessage());
|
||||||
|
} finally {
|
||||||
|
releaseModels();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadModels() {
|
||||||
|
String modelDir = asrModelDir;
|
||||||
|
if (modelDir != null && new File(modelDir, "tokens.txt").exists()) {
|
||||||
|
emitStatus("Loading caption model...");
|
||||||
|
recognizer = new OfflineRecognizer(OfflineRecognizerConfig.builder()
|
||||||
|
.setFeatureConfig(FeatureConfig.builder()
|
||||||
|
.setSampleRate(SAMPLE_RATE)
|
||||||
|
.setFeatureDim(FEATURE_DIM)
|
||||||
|
.build())
|
||||||
|
.setModelConfig(OfflineModelConfig.builder()
|
||||||
|
.setMoonshine(OfflineMoonshineModelConfig.builder()
|
||||||
|
.setEncoder(new File(modelDir, "encoder_model.ort").getAbsolutePath())
|
||||||
|
.setMergedDecoder(new File(modelDir, "decoder_model_merged.ort").getAbsolutePath())
|
||||||
|
.build())
|
||||||
|
.setTokens(new File(modelDir, "tokens.txt").getAbsolutePath())
|
||||||
|
.setNumThreads(1)
|
||||||
|
.build())
|
||||||
|
.build());
|
||||||
|
} else {
|
||||||
|
recognizer = null;
|
||||||
|
}
|
||||||
|
String embedModel = speakerModelPath;
|
||||||
|
if (embedModel != null && new File(embedModel).exists()) {
|
||||||
|
speakerId = new FaceclawSpeakerId(embedModel);
|
||||||
|
speakerId.ensureLoaded();
|
||||||
|
} else {
|
||||||
|
speakerId = null;
|
||||||
|
}
|
||||||
|
emitStatus(recognizer != null ? "Captions listening..." : "Captions listening (no ASR model)...");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void releaseModels() {
|
||||||
|
if (recognizer != null) {
|
||||||
|
recognizer.release();
|
||||||
|
recognizer = null;
|
||||||
|
}
|
||||||
|
if (speakerId != null) {
|
||||||
|
speakerId.close();
|
||||||
|
speakerId = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] takeChunk() {
|
||||||
|
synchronized (queueLock) {
|
||||||
|
while (started && queue.isEmpty()) {
|
||||||
|
try {
|
||||||
|
queueLock.wait(250);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return queue.pollFirst();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void resetSegmentation() {
|
||||||
|
totalSamples = 0;
|
||||||
|
noiseFloor = 0;
|
||||||
|
inUtterance = false;
|
||||||
|
utteranceLength = 0;
|
||||||
|
preRollLength = 0;
|
||||||
|
silenceRunSamples = 0;
|
||||||
|
utterancePeakRms = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void processChunk(byte[] chunk) {
|
||||||
|
int count = chunk.length / 2;
|
||||||
|
short[] pcm = new short[count];
|
||||||
|
double sumSquares = 0;
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
short s = (short) ((chunk[i * 2] & 0xff) | (chunk[i * 2 + 1] << 8));
|
||||||
|
pcm[i] = s;
|
||||||
|
sumSquares += (double) s * s;
|
||||||
|
}
|
||||||
|
double rms = Math.sqrt(sumSquares / Math.max(1, count));
|
||||||
|
totalSamples += count;
|
||||||
|
|
||||||
|
if (!inUtterance) {
|
||||||
|
// Track the noise floor only while idle so speech doesn't raise it.
|
||||||
|
noiseFloor = noiseFloor == 0 ? rms : noiseFloor * (1 - NOISE_EMA_ALPHA) + rms * NOISE_EMA_ALPHA;
|
||||||
|
double threshold = Math.max(noiseFloor, MIN_RMS);
|
||||||
|
if (rms >= threshold * ONSET_FACTOR) {
|
||||||
|
inUtterance = true;
|
||||||
|
utteranceLength = 0;
|
||||||
|
silenceRunSamples = 0;
|
||||||
|
utterancePeakRms = rms;
|
||||||
|
appendUtterance(preRoll, preRollLength);
|
||||||
|
utteranceStartSample = Math.max(0, totalSamples - count - preRollLength);
|
||||||
|
appendUtterance(pcm, count);
|
||||||
|
emitSpeechStart(utteranceStartSample * 1000 / SAMPLE_RATE);
|
||||||
|
} else {
|
||||||
|
appendPreRoll(pcm, count);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
appendUtterance(pcm, count);
|
||||||
|
utterancePeakRms = Math.max(utterancePeakRms, rms);
|
||||||
|
double threshold = Math.max(noiseFloor, MIN_RMS);
|
||||||
|
if (rms < threshold * RELEASE_FACTOR) {
|
||||||
|
silenceRunSamples += count;
|
||||||
|
} else {
|
||||||
|
silenceRunSamples = 0;
|
||||||
|
}
|
||||||
|
long utteranceMs = (long) utteranceLength * 1000 / SAMPLE_RATE;
|
||||||
|
boolean silenceEnded = silenceRunSamples * 1000L / SAMPLE_RATE >= silenceMs;
|
||||||
|
if (silenceEnded || utteranceMs >= MAX_UTTERANCE_MS) {
|
||||||
|
finalizeUtterance();
|
||||||
|
inUtterance = false;
|
||||||
|
preRollLength = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void appendPreRoll(short[] pcm, int count) {
|
||||||
|
// Keep the last PRE_ROLL_MS of idle audio so onset consonants survive.
|
||||||
|
if (count >= preRoll.length) {
|
||||||
|
System.arraycopy(pcm, count - preRoll.length, preRoll, 0, preRoll.length);
|
||||||
|
preRollLength = preRoll.length;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
int keep = Math.min(preRollLength, preRoll.length - count);
|
||||||
|
System.arraycopy(preRoll, preRollLength - keep, preRoll, 0, keep);
|
||||||
|
System.arraycopy(pcm, 0, preRoll, keep, count);
|
||||||
|
preRollLength = keep + count;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void appendUtterance(short[] pcm, int count) {
|
||||||
|
int room = utterance.length - utteranceLength;
|
||||||
|
int copied = Math.min(room, count);
|
||||||
|
if (copied > 0) {
|
||||||
|
System.arraycopy(pcm, 0, utterance, utteranceLength, copied);
|
||||||
|
utteranceLength += copied;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void finalizeUtterance() {
|
||||||
|
int length = utteranceLength;
|
||||||
|
long startMs = utteranceStartSample * 1000 / SAMPLE_RATE;
|
||||||
|
long endMs = (utteranceStartSample + length) * 1000 / SAMPLE_RATE;
|
||||||
|
if (endMs - startMs < MIN_UTTERANCE_MS) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String text = recognizeUtterance(length);
|
||||||
|
float[] embedding = embedUtterance(length);
|
||||||
|
emitUtterance(text, embedding, startMs, endMs, utterancePeakRms);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String recognizeUtterance(int length) {
|
||||||
|
if (recognizer == null || length <= 0) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
StringBuilder joined = new StringBuilder();
|
||||||
|
int offset = 0;
|
||||||
|
while (offset < length) {
|
||||||
|
int remaining = length - offset;
|
||||||
|
int segment = Math.min(remaining, DECODE_SEGMENT_MAX_SAMPLES);
|
||||||
|
if (remaining > DECODE_SEGMENT_MAX_SAMPLES) {
|
||||||
|
segment = findQuietCut(offset, segment);
|
||||||
|
}
|
||||||
|
String part = recognizeRange(offset, segment);
|
||||||
|
if (part.length() > 0) {
|
||||||
|
if (joined.length() > 0 && ".,!?;:%)]}".indexOf(part.charAt(0)) < 0) {
|
||||||
|
joined.append(' ');
|
||||||
|
}
|
||||||
|
joined.append(part);
|
||||||
|
}
|
||||||
|
offset += segment;
|
||||||
|
}
|
||||||
|
return joined.toString().trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* End a decode segment at the center of the quietest window near its end
|
||||||
|
* so the cut lands between words (same approach as the PTT controller).
|
||||||
|
*/
|
||||||
|
private int findQuietCut(int offset, int segment) {
|
||||||
|
int searchStart = Math.max(0, segment - CUT_SEARCH_SAMPLES);
|
||||||
|
int win = CUT_WINDOW_SAMPLES;
|
||||||
|
if (segment - searchStart <= win) {
|
||||||
|
return segment;
|
||||||
|
}
|
||||||
|
double sum = 0;
|
||||||
|
for (int i = searchStart; i < searchStart + win; i++) {
|
||||||
|
double s = utterance[offset + i];
|
||||||
|
sum += s * s;
|
||||||
|
}
|
||||||
|
double best = sum;
|
||||||
|
int bestStart = searchStart;
|
||||||
|
for (int start = searchStart + 1; start + win <= segment; start++) {
|
||||||
|
double dropped = utterance[offset + start - 1];
|
||||||
|
double added = utterance[offset + start + win - 1];
|
||||||
|
sum += added * added - dropped * dropped;
|
||||||
|
if (sum < best) {
|
||||||
|
best = sum;
|
||||||
|
bestStart = start;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bestStart + win / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String recognizeRange(int offset, int count) {
|
||||||
|
float[] samples = new float[count];
|
||||||
|
float peak = 0f;
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
float v = utterance[offset + i] / 32768.0f;
|
||||||
|
samples[i] = v;
|
||||||
|
float a = Math.abs(v);
|
||||||
|
if (a > peak) {
|
||||||
|
peak = a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (peak > 0f) {
|
||||||
|
float gain = Math.min(NORMALIZE_TARGET_PEAK / peak, NORMALIZE_MAX_GAIN);
|
||||||
|
if (gain > 1f) {
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
samples[i] *= gain;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OfflineStream stream = recognizer.createStream();
|
||||||
|
try {
|
||||||
|
stream.acceptWaveform(samples, SAMPLE_RATE);
|
||||||
|
recognizer.decode(stream);
|
||||||
|
OfflineRecognizerResult result = recognizer.getResult(stream);
|
||||||
|
String raw = result == null ? "" : result.getText();
|
||||||
|
return raw == null ? "" : raw.trim();
|
||||||
|
} finally {
|
||||||
|
stream.release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private float[] embedUtterance(int length) {
|
||||||
|
FaceclawSpeakerId currentSpeakerId = speakerId;
|
||||||
|
if (currentSpeakerId == null || length <= 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
int count = Math.min(length, EMBED_MAX_SAMPLES);
|
||||||
|
byte[] le = new byte[count * 2];
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
short s = utterance[i];
|
||||||
|
le[i * 2] = (byte) (s & 0xff);
|
||||||
|
le[i * 2 + 1] = (byte) ((s >> 8) & 0xff);
|
||||||
|
}
|
||||||
|
return currentSpeakerId.embed(le, SAMPLE_RATE);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitUtterance(String text, float[] embedding, long startMs, long endMs, double peakRms) {
|
||||||
|
FaceclawCaptionEngineListener currentListener = listener;
|
||||||
|
if (currentListener == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
float[] embeddingCopy = embedding == null ? null : Arrays.copyOf(embedding, embedding.length);
|
||||||
|
mainHandler.post(() -> currentListener.onUtterance(text, embeddingCopy, startMs, endMs, peakRms));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitSpeechStart(long startMs) {
|
||||||
|
FaceclawCaptionEngineListener currentListener = listener;
|
||||||
|
if (currentListener == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
mainHandler.post(() -> currentListener.onSpeechStart(startMs));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitStatus(String status) {
|
||||||
|
FaceclawCaptionEngineListener currentListener = listener;
|
||||||
|
if (currentListener == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
mainHandler.post(() -> currentListener.onStatus(status));
|
||||||
|
}
|
||||||
|
}
|
||||||
+17
@@ -0,0 +1,17 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
public interface FaceclawCaptionEngineListener {
|
||||||
|
/**
|
||||||
|
* One finished utterance. text may be empty when no ASR model is loaded
|
||||||
|
* or recognition produced nothing; embedding is the L2-normalized
|
||||||
|
* voice-print or null when the speaker model is unavailable or the
|
||||||
|
* utterance was too short. startMs/endMs are on the engine's sample
|
||||||
|
* clock (milliseconds of audio since start()).
|
||||||
|
*/
|
||||||
|
void onUtterance(String text, float[] embedding, long startMs, long endMs, double peakRms);
|
||||||
|
|
||||||
|
/** A speech onset was detected; the utterance is now being collected. */
|
||||||
|
void onSpeechStart(long startMs);
|
||||||
|
|
||||||
|
void onStatus(String status);
|
||||||
|
}
|
||||||
@@ -0,0 +1,778 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.content.ContentValues;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.Cursor;
|
||||||
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
|
import android.database.sqlite.SQLiteOpenHelper;
|
||||||
|
import android.util.Base64;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import org.json.JSONArray;
|
||||||
|
import org.json.JSONException;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.ByteOrder;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persistent store for caption sessions, transcript segments, and speaker
|
||||||
|
* voice profiles, backing the Microphones app and its phone-side review UI.
|
||||||
|
* All complex values cross the JS bridge as JSON strings; voice-print
|
||||||
|
* embeddings are float32 LE blobs, exposed as base64.
|
||||||
|
*/
|
||||||
|
public class FaceclawConversationStore extends SQLiteOpenHelper {
|
||||||
|
private static final String TAG = "FaceclawConvStore";
|
||||||
|
private static final String DB_NAME = "faceclaw-conversations.db";
|
||||||
|
private static final int DB_VERSION = 2;
|
||||||
|
|
||||||
|
private static FaceclawConversationStore instance;
|
||||||
|
|
||||||
|
public static synchronized FaceclawConversationStore getInstance(Context context) {
|
||||||
|
if (instance == null) {
|
||||||
|
instance = new FaceclawConversationStore(context.getApplicationContext());
|
||||||
|
}
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
private FaceclawConversationStore(Context context) {
|
||||||
|
super(context, DB_NAME, null, DB_VERSION);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(SQLiteDatabase db) {
|
||||||
|
db.execSQL("CREATE TABLE speakers ("
|
||||||
|
+ "id INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||||
|
+ "name TEXT NOT NULL,"
|
||||||
|
+ "color TEXT NOT NULL DEFAULT '#4FC3F7',"
|
||||||
|
+ "is_wearer INTEGER NOT NULL DEFAULT 0,"
|
||||||
|
+ "embedding BLOB,"
|
||||||
|
+ "embedding_count INTEGER NOT NULL DEFAULT 0,"
|
||||||
|
+ "created_at INTEGER NOT NULL,"
|
||||||
|
+ "last_heard_at INTEGER,"
|
||||||
|
+ "tag TEXT,"
|
||||||
|
+ "last_recap TEXT,"
|
||||||
|
+ "action_items TEXT,"
|
||||||
|
+ "facts TEXT,"
|
||||||
|
+ "insights_updated_at INTEGER,"
|
||||||
|
+ "insights_session_id INTEGER)");
|
||||||
|
db.execSQL("CREATE TABLE sessions ("
|
||||||
|
+ "id INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||||
|
+ "started_at INTEGER NOT NULL,"
|
||||||
|
+ "ended_at INTEGER,"
|
||||||
|
+ "title TEXT,"
|
||||||
|
+ "audio_path TEXT,"
|
||||||
|
+ "audio_codec TEXT,"
|
||||||
|
+ "avg_sentiment REAL,"
|
||||||
|
+ "segment_count INTEGER NOT NULL DEFAULT 0)");
|
||||||
|
db.execSQL("CREATE TABLE segments ("
|
||||||
|
+ "id INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||||
|
+ "session_id INTEGER NOT NULL,"
|
||||||
|
+ "speaker_id INTEGER,"
|
||||||
|
+ "started_at INTEGER NOT NULL,"
|
||||||
|
+ "ended_at INTEGER NOT NULL,"
|
||||||
|
+ "audio_offset_ms INTEGER,"
|
||||||
|
+ "text TEXT NOT NULL,"
|
||||||
|
+ "lang TEXT,"
|
||||||
|
+ "translation TEXT,"
|
||||||
|
+ "translation_lang TEXT,"
|
||||||
|
+ "sentiment REAL,"
|
||||||
|
+ "emotion TEXT,"
|
||||||
|
+ "search_meta TEXT,"
|
||||||
|
+ "angle INTEGER,"
|
||||||
|
+ "embedding BLOB)");
|
||||||
|
db.execSQL("CREATE INDEX idx_segments_session ON segments(session_id)");
|
||||||
|
db.execSQL("CREATE INDEX idx_segments_speaker ON segments(speaker_id)");
|
||||||
|
db.execSQL("CREATE INDEX idx_segments_time ON segments(started_at)");
|
||||||
|
db.execSQL("CREATE INDEX idx_sessions_time ON sessions(started_at)");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
|
||||||
|
if (oldVersion < 2) {
|
||||||
|
// v2: per-speaker conversation insights (recap of the most recent
|
||||||
|
// conversation, its action items, and accumulated inferred facts).
|
||||||
|
db.execSQL("ALTER TABLE speakers ADD COLUMN last_recap TEXT");
|
||||||
|
db.execSQL("ALTER TABLE speakers ADD COLUMN action_items TEXT");
|
||||||
|
db.execSQL("ALTER TABLE speakers ADD COLUMN facts TEXT");
|
||||||
|
db.execSQL("ALTER TABLE speakers ADD COLUMN insights_updated_at INTEGER");
|
||||||
|
db.execSQL("ALTER TABLE speakers ADD COLUMN insights_session_id INTEGER");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- sessions ----
|
||||||
|
|
||||||
|
public long startSession(long startedAtMs, String title) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("started_at", startedAtMs);
|
||||||
|
values.put("title", title == null || title.isEmpty() ? null : title);
|
||||||
|
return getWritableDatabase().insert("sessions", null, values);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void endSession(long sessionId, long endedAtMs, String audioPath, String audioCodec, double avgSentiment) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("ended_at", endedAtMs);
|
||||||
|
if (audioPath != null && !audioPath.isEmpty()) {
|
||||||
|
values.put("audio_path", audioPath);
|
||||||
|
values.put("audio_codec", audioCodec);
|
||||||
|
}
|
||||||
|
values.put("avg_sentiment", avgSentiment);
|
||||||
|
getWritableDatabase().update("sessions", values, "id=?", new String[]{String.valueOf(sessionId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSessionAudio(long sessionId, String audioPath, String audioCodec) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("audio_path", audioPath);
|
||||||
|
values.put("audio_codec", audioCodec);
|
||||||
|
getWritableDatabase().update("sessions", values, "id=?", new String[]{String.valueOf(sessionId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSessionAudioPath(long sessionId) {
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(
|
||||||
|
"SELECT audio_path FROM sessions WHERE id=?", new String[]{String.valueOf(sessionId)})) {
|
||||||
|
if (c.moveToFirst()) {
|
||||||
|
return c.isNull(0) ? "" : c.getString(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sessions, newest first, as JSON. filterJson supports: sinceMs, untilMs,
|
||||||
|
* speakerId, emotion (matches any segment emotion in the session), query
|
||||||
|
* (LIKE over title and segment text/search metadata), limit.
|
||||||
|
*/
|
||||||
|
public String querySessions(String filterJson) {
|
||||||
|
try {
|
||||||
|
JSONObject filter = filterJson == null || filterJson.isEmpty()
|
||||||
|
? new JSONObject() : new JSONObject(filterJson);
|
||||||
|
StringBuilder sql = new StringBuilder(
|
||||||
|
"SELECT DISTINCT s.id, s.started_at, s.ended_at, s.title, s.audio_path, s.audio_codec,"
|
||||||
|
+ " s.avg_sentiment, s.segment_count FROM sessions s");
|
||||||
|
List<String> args = new ArrayList<>();
|
||||||
|
List<String> where = new ArrayList<>();
|
||||||
|
boolean joinSegments = filter.has("speakerId") || filter.has("emotion") || filter.has("query");
|
||||||
|
if (joinSegments) {
|
||||||
|
sql.append(" LEFT JOIN segments g ON g.session_id = s.id");
|
||||||
|
}
|
||||||
|
if (filter.has("sinceMs")) {
|
||||||
|
where.add("s.started_at >= ?");
|
||||||
|
args.add(String.valueOf(filter.getLong("sinceMs")));
|
||||||
|
}
|
||||||
|
if (filter.has("untilMs")) {
|
||||||
|
where.add("s.started_at <= ?");
|
||||||
|
args.add(String.valueOf(filter.getLong("untilMs")));
|
||||||
|
}
|
||||||
|
if (filter.has("speakerId")) {
|
||||||
|
where.add("g.speaker_id = ?");
|
||||||
|
args.add(String.valueOf(filter.getLong("speakerId")));
|
||||||
|
}
|
||||||
|
if (filter.has("emotion")) {
|
||||||
|
where.add("g.emotion = ?");
|
||||||
|
args.add(filter.getString("emotion"));
|
||||||
|
}
|
||||||
|
if (filter.has("query")) {
|
||||||
|
String like = "%" + filter.getString("query") + "%";
|
||||||
|
where.add("(s.title LIKE ? OR g.text LIKE ? OR g.search_meta LIKE ?)");
|
||||||
|
args.add(like);
|
||||||
|
args.add(like);
|
||||||
|
args.add(like);
|
||||||
|
}
|
||||||
|
if (!where.isEmpty()) {
|
||||||
|
sql.append(" WHERE ").append(String.join(" AND ", where));
|
||||||
|
}
|
||||||
|
sql.append(" ORDER BY s.started_at DESC");
|
||||||
|
int limit = filter.optInt("limit", 200);
|
||||||
|
sql.append(" LIMIT ").append(Math.max(1, Math.min(limit, 1000)));
|
||||||
|
|
||||||
|
JSONArray out = new JSONArray();
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(sql.toString(), args.toArray(new String[0]))) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
JSONObject row = new JSONObject();
|
||||||
|
long id = c.getLong(0);
|
||||||
|
row.put("id", id);
|
||||||
|
row.put("startedAt", c.getLong(1));
|
||||||
|
row.put("endedAt", c.isNull(2) ? JSONObject.NULL : c.getLong(2));
|
||||||
|
row.put("title", c.isNull(3) ? "" : c.getString(3));
|
||||||
|
row.put("audioPath", c.isNull(4) ? "" : c.getString(4));
|
||||||
|
row.put("audioCodec", c.isNull(5) ? "" : c.getString(5));
|
||||||
|
row.put("avgSentiment", c.isNull(6) ? 0 : c.getDouble(6));
|
||||||
|
row.put("segmentCount", c.getLong(7));
|
||||||
|
row.put("speakers", sessionSpeakersJson(id));
|
||||||
|
out.put(row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.w(TAG, "querySessions failed", e);
|
||||||
|
return "[]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private JSONArray sessionSpeakersJson(long sessionId) throws JSONException {
|
||||||
|
JSONArray out = new JSONArray();
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(
|
||||||
|
"SELECT DISTINCT p.id, p.name, p.color FROM segments g"
|
||||||
|
+ " JOIN speakers p ON p.id = g.speaker_id WHERE g.session_id=?",
|
||||||
|
new String[]{String.valueOf(sessionId)})) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
JSONObject row = new JSONObject();
|
||||||
|
row.put("id", c.getLong(0));
|
||||||
|
row.put("name", c.getString(1));
|
||||||
|
row.put("color", c.getString(2));
|
||||||
|
out.put(row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- segments ----
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Insert one transcript segment. json fields: sessionId, speakerId?,
|
||||||
|
* startedAt, endedAt, audioOffsetMs?, text, lang?, translation?,
|
||||||
|
* translationLang?, sentiment?, emotion?, searchMeta?, angle?,
|
||||||
|
* embeddingBase64?. Returns the new row id, or -1.
|
||||||
|
*/
|
||||||
|
public long insertSegment(String json) {
|
||||||
|
try {
|
||||||
|
JSONObject s = new JSONObject(json);
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
long sessionId = s.getLong("sessionId");
|
||||||
|
values.put("session_id", sessionId);
|
||||||
|
if (s.has("speakerId")) {
|
||||||
|
values.put("speaker_id", s.getLong("speakerId"));
|
||||||
|
}
|
||||||
|
values.put("started_at", s.getLong("startedAt"));
|
||||||
|
values.put("ended_at", s.getLong("endedAt"));
|
||||||
|
if (s.has("audioOffsetMs")) {
|
||||||
|
values.put("audio_offset_ms", s.getLong("audioOffsetMs"));
|
||||||
|
}
|
||||||
|
values.put("text", s.getString("text"));
|
||||||
|
putOptString(values, s, "lang", "lang");
|
||||||
|
putOptString(values, s, "translation", "translation");
|
||||||
|
putOptString(values, s, "translationLang", "translation_lang");
|
||||||
|
if (s.has("sentiment")) {
|
||||||
|
values.put("sentiment", s.getDouble("sentiment"));
|
||||||
|
}
|
||||||
|
putOptString(values, s, "emotion", "emotion");
|
||||||
|
putOptString(values, s, "searchMeta", "search_meta");
|
||||||
|
if (s.has("angle")) {
|
||||||
|
values.put("angle", s.getInt("angle"));
|
||||||
|
}
|
||||||
|
if (s.has("embeddingBase64")) {
|
||||||
|
values.put("embedding", Base64.decode(s.getString("embeddingBase64"), Base64.NO_WRAP));
|
||||||
|
}
|
||||||
|
SQLiteDatabase db = getWritableDatabase();
|
||||||
|
long id = db.insert("segments", null, values);
|
||||||
|
db.execSQL("UPDATE sessions SET segment_count = segment_count + 1 WHERE id=?",
|
||||||
|
new Object[]{sessionId});
|
||||||
|
return id;
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "insertSegment failed", t);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void putOptString(ContentValues values, JSONObject s, String jsonKey, String column)
|
||||||
|
throws JSONException {
|
||||||
|
if (s.has(jsonKey) && !s.isNull(jsonKey)) {
|
||||||
|
values.put(column, s.getString(jsonKey));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Update mutable fields of a segment (same keys as insertSegment). */
|
||||||
|
public void updateSegment(long segmentId, String json) {
|
||||||
|
try {
|
||||||
|
JSONObject s = new JSONObject(json);
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
if (s.has("speakerId")) {
|
||||||
|
if (s.isNull("speakerId")) {
|
||||||
|
values.putNull("speaker_id");
|
||||||
|
} else {
|
||||||
|
values.put("speaker_id", s.getLong("speakerId"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (s.has("text")) {
|
||||||
|
values.put("text", s.getString("text"));
|
||||||
|
}
|
||||||
|
putOptString(values, s, "lang", "lang");
|
||||||
|
putOptString(values, s, "translation", "translation");
|
||||||
|
putOptString(values, s, "translationLang", "translation_lang");
|
||||||
|
if (s.has("sentiment")) {
|
||||||
|
values.put("sentiment", s.getDouble("sentiment"));
|
||||||
|
}
|
||||||
|
putOptString(values, s, "emotion", "emotion");
|
||||||
|
putOptString(values, s, "searchMeta", "search_meta");
|
||||||
|
if (values.size() > 0) {
|
||||||
|
getWritableDatabase().update("segments", values, "id=?",
|
||||||
|
new String[]{String.valueOf(segmentId)});
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "updateSegment failed", t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String querySegments(long sessionId) {
|
||||||
|
JSONArray out = new JSONArray();
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(
|
||||||
|
"SELECT id, speaker_id, started_at, ended_at, audio_offset_ms, text, lang,"
|
||||||
|
+ " translation, translation_lang, sentiment, emotion, angle"
|
||||||
|
+ " FROM segments WHERE session_id=? ORDER BY started_at ASC",
|
||||||
|
new String[]{String.valueOf(sessionId)})) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
out.put(segmentRowJson(c));
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.w(TAG, "querySegments failed", e);
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private JSONObject segmentRowJson(Cursor c) throws JSONException {
|
||||||
|
JSONObject row = new JSONObject();
|
||||||
|
row.put("id", c.getLong(0));
|
||||||
|
row.put("speakerId", c.isNull(1) ? JSONObject.NULL : c.getLong(1));
|
||||||
|
row.put("startedAt", c.getLong(2));
|
||||||
|
row.put("endedAt", c.getLong(3));
|
||||||
|
row.put("audioOffsetMs", c.isNull(4) ? JSONObject.NULL : c.getLong(4));
|
||||||
|
row.put("text", c.getString(5));
|
||||||
|
row.put("lang", c.isNull(6) ? "" : c.getString(6));
|
||||||
|
row.put("translation", c.isNull(7) ? "" : c.getString(7));
|
||||||
|
row.put("translationLang", c.isNull(8) ? "" : c.getString(8));
|
||||||
|
row.put("sentiment", c.isNull(9) ? 0 : c.getDouble(9));
|
||||||
|
row.put("emotion", c.isNull(10) ? "" : c.getString(10));
|
||||||
|
row.put("angle", c.isNull(11) ? JSONObject.NULL : c.getInt(11));
|
||||||
|
return row;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Search segments across sessions. filterJson: query?, emotion?,
|
||||||
|
* speakerId?, sinceMs?, untilMs?, limit?. Matches text, translation, and
|
||||||
|
* the sentiment search metadata.
|
||||||
|
*/
|
||||||
|
public String searchSegments(String filterJson) {
|
||||||
|
try {
|
||||||
|
JSONObject filter = filterJson == null || filterJson.isEmpty()
|
||||||
|
? new JSONObject() : new JSONObject(filterJson);
|
||||||
|
StringBuilder sql = new StringBuilder(
|
||||||
|
"SELECT id, speaker_id, started_at, ended_at, audio_offset_ms, text, lang,"
|
||||||
|
+ " translation, translation_lang, sentiment, emotion, angle, session_id"
|
||||||
|
+ " FROM segments");
|
||||||
|
List<String> args = new ArrayList<>();
|
||||||
|
List<String> where = new ArrayList<>();
|
||||||
|
if (filter.has("query") && !filter.getString("query").isEmpty()) {
|
||||||
|
String like = "%" + filter.getString("query") + "%";
|
||||||
|
where.add("(text LIKE ? OR translation LIKE ? OR search_meta LIKE ?)");
|
||||||
|
args.add(like);
|
||||||
|
args.add(like);
|
||||||
|
args.add(like);
|
||||||
|
}
|
||||||
|
if (filter.has("emotion")) {
|
||||||
|
where.add("emotion = ?");
|
||||||
|
args.add(filter.getString("emotion"));
|
||||||
|
}
|
||||||
|
if (filter.has("speakerId")) {
|
||||||
|
where.add("speaker_id = ?");
|
||||||
|
args.add(String.valueOf(filter.getLong("speakerId")));
|
||||||
|
}
|
||||||
|
if (filter.has("sinceMs")) {
|
||||||
|
where.add("started_at >= ?");
|
||||||
|
args.add(String.valueOf(filter.getLong("sinceMs")));
|
||||||
|
}
|
||||||
|
if (filter.has("untilMs")) {
|
||||||
|
where.add("started_at <= ?");
|
||||||
|
args.add(String.valueOf(filter.getLong("untilMs")));
|
||||||
|
}
|
||||||
|
if (!where.isEmpty()) {
|
||||||
|
sql.append(" WHERE ").append(String.join(" AND ", where));
|
||||||
|
}
|
||||||
|
sql.append(" ORDER BY started_at DESC LIMIT ")
|
||||||
|
.append(Math.max(1, Math.min(filter.optInt("limit", 300), 1000)));
|
||||||
|
JSONArray out = new JSONArray();
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(sql.toString(), args.toArray(new String[0]))) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
JSONObject row = segmentRowJson(c);
|
||||||
|
row.put("sessionId", c.getLong(12));
|
||||||
|
out.put(row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.w(TAG, "searchSegments failed", e);
|
||||||
|
return "[]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Per-segment voice-print embeddings of a session (for re-diarization). */
|
||||||
|
public String querySegmentEmbeddings(long sessionId) {
|
||||||
|
JSONArray out = new JSONArray();
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(
|
||||||
|
"SELECT id, embedding FROM segments WHERE session_id=? AND embedding IS NOT NULL",
|
||||||
|
new String[]{String.valueOf(sessionId)})) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
JSONObject row = new JSONObject();
|
||||||
|
row.put("id", c.getLong(0));
|
||||||
|
row.put("embeddingBase64", Base64.encodeToString(c.getBlob(1), Base64.NO_WRAP));
|
||||||
|
out.put(row);
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.w(TAG, "querySegmentEmbeddings failed", e);
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- speakers ----
|
||||||
|
|
||||||
|
public long createSpeaker(String name, String color, boolean isWearer, String embeddingBase64) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("name", name);
|
||||||
|
values.put("color", color == null || color.isEmpty() ? "#4FC3F7" : color);
|
||||||
|
values.put("is_wearer", isWearer ? 1 : 0);
|
||||||
|
values.put("created_at", System.currentTimeMillis());
|
||||||
|
values.put("last_heard_at", System.currentTimeMillis());
|
||||||
|
if (embeddingBase64 != null && !embeddingBase64.isEmpty()) {
|
||||||
|
values.put("embedding", Base64.decode(embeddingBase64, Base64.NO_WRAP));
|
||||||
|
values.put("embedding_count", 1);
|
||||||
|
}
|
||||||
|
return getWritableDatabase().insert("speakers", null, values);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String querySpeakers() {
|
||||||
|
JSONArray out = new JSONArray();
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(
|
||||||
|
"SELECT p.id, p.name, p.color, p.is_wearer, p.embedding, p.embedding_count,"
|
||||||
|
+ " p.last_heard_at, p.tag,"
|
||||||
|
+ " p.last_recap, p.action_items, p.facts, p.insights_updated_at, p.insights_session_id,"
|
||||||
|
+ " (SELECT COUNT(*) FROM segments g WHERE g.speaker_id = p.id) AS segments"
|
||||||
|
+ " FROM speakers p ORDER BY p.last_heard_at DESC", null)) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
JSONObject row = new JSONObject();
|
||||||
|
row.put("id", c.getLong(0));
|
||||||
|
row.put("name", c.getString(1));
|
||||||
|
row.put("color", c.getString(2));
|
||||||
|
row.put("isWearer", c.getInt(3) != 0);
|
||||||
|
byte[] blob = c.isNull(4) ? null : c.getBlob(4);
|
||||||
|
row.put("embeddingBase64", blob == null ? "" : Base64.encodeToString(blob, Base64.NO_WRAP));
|
||||||
|
row.put("embeddingCount", c.getInt(5));
|
||||||
|
row.put("lastHeardAt", c.isNull(6) ? 0 : c.getLong(6));
|
||||||
|
row.put("tag", c.isNull(7) ? "" : c.getString(7));
|
||||||
|
row.put("lastRecap", c.isNull(8) ? "" : c.getString(8));
|
||||||
|
row.put("actionItemsJson", c.isNull(9) ? "" : c.getString(9));
|
||||||
|
row.put("factsJson", c.isNull(10) ? "" : c.getString(10));
|
||||||
|
row.put("insightsUpdatedAt", c.isNull(11) ? 0 : c.getLong(11));
|
||||||
|
row.put("insightsSessionId", c.isNull(12) ? 0 : c.getLong(12));
|
||||||
|
row.put("segmentCount", c.getLong(13));
|
||||||
|
out.put(row);
|
||||||
|
}
|
||||||
|
} catch (JSONException e) {
|
||||||
|
Log.w(TAG, "querySpeakers failed", e);
|
||||||
|
}
|
||||||
|
return out.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renameSpeaker(long speakerId, String name) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("name", name);
|
||||||
|
getWritableDatabase().update("speakers", values, "id=?", new String[]{String.valueOf(speakerId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSpeakerColor(long speakerId, String color) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("color", color);
|
||||||
|
getWritableDatabase().update("speakers", values, "id=?", new String[]{String.valueOf(speakerId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSpeakerTag(long speakerId, String tag) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("tag", tag);
|
||||||
|
getWritableDatabase().update("speakers", values, "id=?", new String[]{String.valueOf(speakerId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store LLM-derived conversation insights for a speaker: a recap of their
|
||||||
|
* most recent conversation, its open action items (JSON string array), and
|
||||||
|
* the accumulated inferred facts about them (JSON string array).
|
||||||
|
*/
|
||||||
|
public void setSpeakerInsights(long speakerId, String recap, String actionItemsJson,
|
||||||
|
String factsJson, long sessionId) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("last_recap", recap == null ? "" : recap);
|
||||||
|
values.put("action_items", actionItemsJson == null ? "" : actionItemsJson);
|
||||||
|
values.put("facts", factsJson == null ? "" : factsJson);
|
||||||
|
values.put("insights_updated_at", System.currentTimeMillis());
|
||||||
|
values.put("insights_session_id", sessionId);
|
||||||
|
getWritableDatabase().update("speakers", values, "id=?", new String[]{String.valueOf(speakerId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSpeakerWearer(long speakerId, boolean isWearer) {
|
||||||
|
SQLiteDatabase db = getWritableDatabase();
|
||||||
|
if (isWearer) {
|
||||||
|
// Exactly one wearer profile at a time.
|
||||||
|
db.execSQL("UPDATE speakers SET is_wearer = 0");
|
||||||
|
}
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("is_wearer", isWearer ? 1 : 0);
|
||||||
|
db.update("speakers", values, "id=?", new String[]{String.valueOf(speakerId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Running-mean centroid update for a speaker's voice-print, capped so a
|
||||||
|
* long session cannot drown the enrolled voice.
|
||||||
|
*/
|
||||||
|
public void updateSpeakerEmbedding(long speakerId, String embeddingBase64, int maxCount) {
|
||||||
|
try {
|
||||||
|
byte[] incoming = Base64.decode(embeddingBase64, Base64.NO_WRAP);
|
||||||
|
float[] update = blobToFloats(incoming);
|
||||||
|
if (update == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
float[] current = null;
|
||||||
|
int count = 0;
|
||||||
|
try (Cursor c = getReadableDatabase().rawQuery(
|
||||||
|
"SELECT embedding, embedding_count FROM speakers WHERE id=?",
|
||||||
|
new String[]{String.valueOf(speakerId)})) {
|
||||||
|
if (c.moveToFirst()) {
|
||||||
|
current = c.isNull(0) ? null : blobToFloats(c.getBlob(0));
|
||||||
|
count = c.getInt(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
float[] merged;
|
||||||
|
if (current == null || current.length != update.length) {
|
||||||
|
merged = update;
|
||||||
|
count = 1;
|
||||||
|
} else {
|
||||||
|
int effective = Math.min(count, Math.max(1, maxCount));
|
||||||
|
merged = new float[current.length];
|
||||||
|
for (int i = 0; i < merged.length; i++) {
|
||||||
|
merged[i] = (current[i] * effective + update[i]) / (effective + 1);
|
||||||
|
}
|
||||||
|
l2NormalizeInPlace(merged);
|
||||||
|
count = count + 1;
|
||||||
|
}
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("embedding", floatsToBlob(merged));
|
||||||
|
values.put("embedding_count", count);
|
||||||
|
values.put("last_heard_at", System.currentTimeMillis());
|
||||||
|
getWritableDatabase().update("speakers", values, "id=?",
|
||||||
|
new String[]{String.valueOf(speakerId)});
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "updateSpeakerEmbedding failed", t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Move every segment from one speaker onto another and drop the source. */
|
||||||
|
public void mergeSpeakers(long fromId, long intoId) {
|
||||||
|
if (fromId == intoId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
SQLiteDatabase db = getWritableDatabase();
|
||||||
|
db.beginTransaction();
|
||||||
|
try {
|
||||||
|
db.execSQL("UPDATE segments SET speaker_id=? WHERE speaker_id=?",
|
||||||
|
new Object[]{intoId, fromId});
|
||||||
|
// Blend the two centroids weighted by their sample counts.
|
||||||
|
float[] from = null;
|
||||||
|
float[] into = null;
|
||||||
|
int fromCount = 0;
|
||||||
|
int intoCount = 0;
|
||||||
|
boolean fromWearer = false;
|
||||||
|
try (Cursor c = db.rawQuery(
|
||||||
|
"SELECT id, embedding, embedding_count, is_wearer FROM speakers WHERE id IN (?,?)",
|
||||||
|
new String[]{String.valueOf(fromId), String.valueOf(intoId)})) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
long id = c.getLong(0);
|
||||||
|
float[] embedding = c.isNull(1) ? null : blobToFloats(c.getBlob(1));
|
||||||
|
int count = c.getInt(2);
|
||||||
|
if (id == fromId) {
|
||||||
|
from = embedding;
|
||||||
|
fromCount = count;
|
||||||
|
fromWearer = c.getInt(3) != 0;
|
||||||
|
} else {
|
||||||
|
into = embedding;
|
||||||
|
intoCount = count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
float[] merged = into;
|
||||||
|
if (from != null && into != null && from.length == into.length) {
|
||||||
|
merged = new float[into.length];
|
||||||
|
int total = Math.max(1, fromCount + intoCount);
|
||||||
|
for (int i = 0; i < merged.length; i++) {
|
||||||
|
merged[i] = (into[i] * intoCount + from[i] * fromCount) / total;
|
||||||
|
}
|
||||||
|
l2NormalizeInPlace(merged);
|
||||||
|
} else if (into == null) {
|
||||||
|
merged = from;
|
||||||
|
}
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
if (merged != null) {
|
||||||
|
values.put("embedding", floatsToBlob(merged));
|
||||||
|
values.put("embedding_count", fromCount + intoCount);
|
||||||
|
}
|
||||||
|
if (fromWearer) {
|
||||||
|
values.put("is_wearer", 1);
|
||||||
|
}
|
||||||
|
values.put("last_heard_at", System.currentTimeMillis());
|
||||||
|
// Keep the target's conversation insights; adopt the source's only
|
||||||
|
// where the target has none (e.g. merging a rich profile into a
|
||||||
|
// freshly auto-created one).
|
||||||
|
try (Cursor c = db.rawQuery(
|
||||||
|
"SELECT last_recap, action_items, facts, insights_updated_at, insights_session_id"
|
||||||
|
+ " FROM speakers WHERE id IN (?,?) ORDER BY CASE id WHEN ? THEN 0 ELSE 1 END",
|
||||||
|
new String[]{String.valueOf(fromId), String.valueOf(intoId), String.valueOf(intoId)})) {
|
||||||
|
boolean targetHasInsights = false;
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
boolean hasInsights = !c.isNull(0) && !c.getString(0).isEmpty();
|
||||||
|
if (c.getPosition() == 0) {
|
||||||
|
targetHasInsights = hasInsights;
|
||||||
|
} else if (!targetHasInsights && hasInsights) {
|
||||||
|
values.put("last_recap", c.getString(0));
|
||||||
|
values.put("action_items", c.isNull(1) ? "" : c.getString(1));
|
||||||
|
values.put("facts", c.isNull(2) ? "" : c.getString(2));
|
||||||
|
values.put("insights_updated_at", c.isNull(3) ? 0 : c.getLong(3));
|
||||||
|
values.put("insights_session_id", c.isNull(4) ? 0 : c.getLong(4));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
db.update("speakers", values, "id=?", new String[]{String.valueOf(intoId)});
|
||||||
|
db.delete("speakers", "id=?", new String[]{String.valueOf(fromId)});
|
||||||
|
db.setTransactionSuccessful();
|
||||||
|
} finally {
|
||||||
|
db.endTransaction();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void reassignSegmentSpeaker(long segmentId, long speakerId) {
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
values.put("speaker_id", speakerId);
|
||||||
|
getWritableDatabase().update("segments", values, "id=?", new String[]{String.valueOf(segmentId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Reassign every segment of a speaker within one session (split support). */
|
||||||
|
public void reassignSessionSpeaker(long sessionId, long fromSpeakerId, long toSpeakerId) {
|
||||||
|
getWritableDatabase().execSQL(
|
||||||
|
"UPDATE segments SET speaker_id=? WHERE session_id=? AND speaker_id=?",
|
||||||
|
new Object[]{toSpeakerId, sessionId, fromSpeakerId});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteSpeaker(long speakerId) {
|
||||||
|
SQLiteDatabase db = getWritableDatabase();
|
||||||
|
db.execSQL("UPDATE segments SET speaker_id=NULL WHERE speaker_id=?", new Object[]{speakerId});
|
||||||
|
db.delete("speakers", "id=?", new String[]{String.valueOf(speakerId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- retention ----
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete caption sessions older than the cutoff (0 disables), and strip
|
||||||
|
* recordings older than their own cutoff while keeping the transcript.
|
||||||
|
* Returns a JSON summary of what was removed.
|
||||||
|
*/
|
||||||
|
public String applyRetention(long captionCutoffMs, long recordingCutoffMs) {
|
||||||
|
SQLiteDatabase db = getWritableDatabase();
|
||||||
|
int sessionsDeleted = 0;
|
||||||
|
int recordingsDeleted = 0;
|
||||||
|
if (recordingCutoffMs > 0) {
|
||||||
|
List<String> paths = new ArrayList<>();
|
||||||
|
try (Cursor c = db.rawQuery(
|
||||||
|
"SELECT id, audio_path FROM sessions WHERE audio_path IS NOT NULL AND started_at < ?",
|
||||||
|
new String[]{String.valueOf(recordingCutoffMs)})) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
if (!c.isNull(1)) {
|
||||||
|
paths.add(c.getString(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (String path : paths) {
|
||||||
|
if (new File(path).delete()) {
|
||||||
|
recordingsDeleted++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
db.execSQL("UPDATE sessions SET audio_path=NULL, audio_codec=NULL WHERE started_at < ?",
|
||||||
|
new Object[]{recordingCutoffMs});
|
||||||
|
}
|
||||||
|
if (captionCutoffMs > 0) {
|
||||||
|
List<String> paths = new ArrayList<>();
|
||||||
|
try (Cursor c = db.rawQuery(
|
||||||
|
"SELECT audio_path FROM sessions WHERE audio_path IS NOT NULL AND started_at < ?",
|
||||||
|
new String[]{String.valueOf(captionCutoffMs)})) {
|
||||||
|
while (c.moveToNext()) {
|
||||||
|
paths.add(c.getString(0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (String path : paths) {
|
||||||
|
if (path != null && new File(path).delete()) {
|
||||||
|
recordingsDeleted++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
db.execSQL("DELETE FROM segments WHERE session_id IN (SELECT id FROM sessions WHERE started_at < ?)",
|
||||||
|
new Object[]{captionCutoffMs});
|
||||||
|
Cursor count = db.rawQuery("SELECT changes()", null);
|
||||||
|
count.close();
|
||||||
|
db.execSQL("DELETE FROM sessions WHERE started_at < ?", new Object[]{captionCutoffMs});
|
||||||
|
try (Cursor c = db.rawQuery("SELECT changes()", null)) {
|
||||||
|
if (c.moveToFirst()) {
|
||||||
|
sessionsDeleted = c.getInt(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
JSONObject summary = new JSONObject();
|
||||||
|
summary.put("sessionsDeleted", sessionsDeleted);
|
||||||
|
summary.put("recordingsDeleted", recordingsDeleted);
|
||||||
|
return summary.toString();
|
||||||
|
} catch (JSONException e) {
|
||||||
|
return "{}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteSession(long sessionId) {
|
||||||
|
SQLiteDatabase db = getWritableDatabase();
|
||||||
|
String path = getSessionAudioPath(sessionId);
|
||||||
|
if (!path.isEmpty()) {
|
||||||
|
new File(path).delete();
|
||||||
|
}
|
||||||
|
db.delete("segments", "session_id=?", new String[]{String.valueOf(sessionId)});
|
||||||
|
db.delete("sessions", "id=?", new String[]{String.valueOf(sessionId)});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- blob helpers ----
|
||||||
|
|
||||||
|
private static float[] blobToFloats(byte[] blob) {
|
||||||
|
if (blob == null || blob.length < 4 || blob.length % 4 != 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
ByteBuffer buffer = ByteBuffer.wrap(blob).order(ByteOrder.LITTLE_ENDIAN);
|
||||||
|
float[] out = new float[blob.length / 4];
|
||||||
|
for (int i = 0; i < out.length; i++) {
|
||||||
|
out[i] = buffer.getFloat();
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] floatsToBlob(float[] values) {
|
||||||
|
ByteBuffer buffer = ByteBuffer.allocate(values.length * 4).order(ByteOrder.LITTLE_ENDIAN);
|
||||||
|
for (float v : values) {
|
||||||
|
buffer.putFloat(v);
|
||||||
|
}
|
||||||
|
return buffer.array();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void l2NormalizeInPlace(float[] v) {
|
||||||
|
double sum = 0;
|
||||||
|
for (float x : v) {
|
||||||
|
sum += (double) x * x;
|
||||||
|
}
|
||||||
|
double norm = Math.sqrt(sum);
|
||||||
|
if (norm <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < v.length; i++) {
|
||||||
|
v[i] = (float) (v[i] / norm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,9 +37,6 @@ import java.util.Set;
|
|||||||
* matching are decided in TypeScript (app/g2/even-advertisement.ts,
|
* matching are decided in TypeScript (app/g2/even-advertisement.ts,
|
||||||
* app/g2/pairing-candidates.ts) where they can be unit-tested; this filter
|
* app/g2/pairing-candidates.ts) where they can be unit-tested; this filter
|
||||||
* must stay a superset of the TS classifier's admission.
|
* must stay a superset of the TS classifier's admission.
|
||||||
*
|
|
||||||
* Ported from the discovery path of SybilSight's Bluetooth SDK (G2.didDiscover
|
|
||||||
* and R1's advertisement snapshot), reduced to what Android exposes.
|
|
||||||
*/
|
*/
|
||||||
@SuppressLint("MissingPermission")
|
@SuppressLint("MissingPermission")
|
||||||
public class FaceclawDeviceDiscovery {
|
public class FaceclawDeviceDiscovery {
|
||||||
@@ -296,7 +293,7 @@ public class FaceclawDeviceDiscovery {
|
|||||||
/**
|
/**
|
||||||
* Android strips the 2-byte company identifier from each manufacturer
|
* Android strips the 2-byte company identifier from each manufacturer
|
||||||
* record and keys the SparseArray by it. Put the bytes back (little-endian)
|
* record and keys the SparseArray by it. Put the bytes back (little-endian)
|
||||||
* so TypeScript sees the same "ER"+… layout the iOS SDK and HCI captures
|
* so TypeScript sees the same "ER"+… layout the HCI captures
|
||||||
* document. Prefers Even's own id; otherwise returns the first record so an
|
* document. Prefers Even's own id; otherwise returns the first record so an
|
||||||
* unexpected company id still reaches the diagnostics log.
|
* unexpected company id still reaches the diagnostics log.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -0,0 +1,262 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.k2fsa.sherpa.onnx.FastClusteringConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineSpeakerDiarization;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineSpeakerDiarizationConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineSpeakerDiarizationSegment;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineSpeakerSegmentationModelConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.OfflineSpeakerSegmentationPyannoteModelConfig;
|
||||||
|
import com.k2fsa.sherpa.onnx.SpeakerEmbeddingExtractorConfig;
|
||||||
|
|
||||||
|
import org.json.JSONArray;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
import java.io.DataInputStream;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offline re-diarization of a stored conversation recording (16-bit mono
|
||||||
|
* WAV): pyannote segmentation plus the shared speaker-embedding model with
|
||||||
|
* clustering, via sherpa-onnx. Runs on its own thread; results are handed to
|
||||||
|
* TS as JSON turns for reconciliation against the transcript segments.
|
||||||
|
*/
|
||||||
|
public class FaceclawDiarizer {
|
||||||
|
private static final String TAG = "FaceclawDiarizer";
|
||||||
|
|
||||||
|
public interface Listener {
|
||||||
|
/** progress in [0, 1]. */
|
||||||
|
void onProgress(double progress);
|
||||||
|
|
||||||
|
/** turns: [{startMs, endMs, cluster}], sorted by start time. */
|
||||||
|
void onDone(String turnsJson);
|
||||||
|
|
||||||
|
void onError(String message);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final String segmentationModelPath;
|
||||||
|
private final String embeddingModelPath;
|
||||||
|
private final String wavPath;
|
||||||
|
private final int numClusters;
|
||||||
|
private final float threshold;
|
||||||
|
private final Listener listener;
|
||||||
|
private final Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||||
|
private volatile boolean cancelled;
|
||||||
|
|
||||||
|
public FaceclawDiarizer(
|
||||||
|
String segmentationModelPath,
|
||||||
|
String embeddingModelPath,
|
||||||
|
String wavPath,
|
||||||
|
int numClusters,
|
||||||
|
float threshold,
|
||||||
|
Listener listener) {
|
||||||
|
this.segmentationModelPath = segmentationModelPath;
|
||||||
|
this.embeddingModelPath = embeddingModelPath;
|
||||||
|
this.wavPath = wavPath;
|
||||||
|
this.numClusters = numClusters;
|
||||||
|
this.threshold = threshold <= 0 ? 0.5f : threshold;
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void start() {
|
||||||
|
Thread thread = new Thread(this::run, "FaceclawDiarizer");
|
||||||
|
thread.setPriority(Thread.MIN_PRIORITY);
|
||||||
|
thread.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void cancel() {
|
||||||
|
cancelled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void run() {
|
||||||
|
OfflineSpeakerDiarization diarization = null;
|
||||||
|
try {
|
||||||
|
float[] samples = wavPath.endsWith(".wav")
|
||||||
|
? readWavMono16(wavPath)
|
||||||
|
: decodeCompressedMono(wavPath);
|
||||||
|
OfflineSpeakerDiarizationConfig config = OfflineSpeakerDiarizationConfig.builder()
|
||||||
|
.setSegmentation(OfflineSpeakerSegmentationModelConfig.builder()
|
||||||
|
.setPyannote(OfflineSpeakerSegmentationPyannoteModelConfig.builder()
|
||||||
|
.setModel(segmentationModelPath)
|
||||||
|
.build())
|
||||||
|
.setNumThreads(1)
|
||||||
|
.build())
|
||||||
|
.setEmbedding(SpeakerEmbeddingExtractorConfig.builder()
|
||||||
|
.setModel(embeddingModelPath)
|
||||||
|
.setNumThreads(1)
|
||||||
|
.build())
|
||||||
|
.setClustering(FastClusteringConfig.builder()
|
||||||
|
.setNumClusters(numClusters > 0 ? numClusters : -1)
|
||||||
|
.setThreshold(threshold)
|
||||||
|
.build())
|
||||||
|
.setMinDurationOn(0.3f)
|
||||||
|
.setMinDurationOff(0.5f)
|
||||||
|
.build();
|
||||||
|
diarization = new OfflineSpeakerDiarization(config);
|
||||||
|
OfflineSpeakerDiarizationSegment[] segments = diarization.processWithCallback(
|
||||||
|
samples,
|
||||||
|
(numProcessedChunks, numTotalChunks, arg) -> {
|
||||||
|
emitProgress(numTotalChunks <= 0 ? 0
|
||||||
|
: (double) numProcessedChunks / numTotalChunks);
|
||||||
|
return cancelled ? 1 : 0;
|
||||||
|
});
|
||||||
|
JSONArray turns = new JSONArray();
|
||||||
|
if (segments != null) {
|
||||||
|
for (OfflineSpeakerDiarizationSegment segment : segments) {
|
||||||
|
JSONObject turn = new JSONObject();
|
||||||
|
turn.put("startMs", Math.round(segment.getStart() * 1000));
|
||||||
|
turn.put("endMs", Math.round(segment.getEnd() * 1000));
|
||||||
|
turn.put("cluster", segment.getSpeaker());
|
||||||
|
turns.put(turn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
String result = turns.toString();
|
||||||
|
mainHandler.post(() -> listener.onDone(result));
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "diarization failed for " + wavPath, t);
|
||||||
|
String message = t.getMessage() == null ? t.toString() : t.getMessage();
|
||||||
|
mainHandler.post(() -> listener.onError(message));
|
||||||
|
} finally {
|
||||||
|
if (diarization != null) {
|
||||||
|
diarization.release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitProgress(double progress) {
|
||||||
|
mainHandler.post(() -> listener.onProgress(Math.max(0, Math.min(1, progress))));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decode a compressed recording (M4A/AAC from the transcode sweep) into
|
||||||
|
* [-1, 1] floats via MediaExtractor + MediaCodec. Recordings are written
|
||||||
|
* as 16 kHz mono, so no resampling is needed.
|
||||||
|
*/
|
||||||
|
private static float[] decodeCompressedMono(String path) throws IOException {
|
||||||
|
android.media.MediaExtractor extractor = new android.media.MediaExtractor();
|
||||||
|
android.media.MediaCodec codec = null;
|
||||||
|
java.io.ByteArrayOutputStream pcm = new java.io.ByteArrayOutputStream();
|
||||||
|
try {
|
||||||
|
extractor.setDataSource(path);
|
||||||
|
int trackIndex = -1;
|
||||||
|
android.media.MediaFormat format = null;
|
||||||
|
for (int i = 0; i < extractor.getTrackCount(); i++) {
|
||||||
|
android.media.MediaFormat candidate = extractor.getTrackFormat(i);
|
||||||
|
String mime = candidate.getString(android.media.MediaFormat.KEY_MIME);
|
||||||
|
if (mime != null && mime.startsWith("audio/")) {
|
||||||
|
trackIndex = i;
|
||||||
|
format = candidate;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (trackIndex < 0 || format == null) {
|
||||||
|
throw new IOException("no audio track in " + path);
|
||||||
|
}
|
||||||
|
extractor.selectTrack(trackIndex);
|
||||||
|
codec = android.media.MediaCodec.createDecoderByType(
|
||||||
|
format.getString(android.media.MediaFormat.KEY_MIME));
|
||||||
|
codec.configure(format, null, null, 0);
|
||||||
|
codec.start();
|
||||||
|
android.media.MediaCodec.BufferInfo info = new android.media.MediaCodec.BufferInfo();
|
||||||
|
boolean inputDone = false;
|
||||||
|
boolean outputDone = false;
|
||||||
|
while (!outputDone) {
|
||||||
|
if (!inputDone) {
|
||||||
|
int inIndex = codec.dequeueInputBuffer(10_000);
|
||||||
|
if (inIndex >= 0) {
|
||||||
|
ByteBuffer inBuf = codec.getInputBuffer(inIndex);
|
||||||
|
int size = extractor.readSampleData(inBuf, 0);
|
||||||
|
if (size < 0) {
|
||||||
|
codec.queueInputBuffer(inIndex, 0, 0, 0,
|
||||||
|
android.media.MediaCodec.BUFFER_FLAG_END_OF_STREAM);
|
||||||
|
inputDone = true;
|
||||||
|
} else {
|
||||||
|
codec.queueInputBuffer(inIndex, 0, size, extractor.getSampleTime(), 0);
|
||||||
|
extractor.advance();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int outIndex = codec.dequeueOutputBuffer(info, 10_000);
|
||||||
|
if (outIndex >= 0) {
|
||||||
|
ByteBuffer outBuf = codec.getOutputBuffer(outIndex);
|
||||||
|
byte[] chunk = new byte[info.size];
|
||||||
|
outBuf.position(info.offset);
|
||||||
|
outBuf.get(chunk);
|
||||||
|
pcm.write(chunk);
|
||||||
|
codec.releaseOutputBuffer(outIndex, false);
|
||||||
|
if ((info.flags & android.media.MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
|
||||||
|
outputDone = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
extractor.release();
|
||||||
|
if (codec != null) {
|
||||||
|
try {
|
||||||
|
codec.stop();
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
}
|
||||||
|
codec.release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
byte[] bytes = pcm.toByteArray();
|
||||||
|
int count = bytes.length / 2;
|
||||||
|
float[] samples = new float[count];
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
samples[i] = ((short) ((bytes[i * 2] & 0xff) | (bytes[i * 2 + 1] << 8))) / 32768.0f;
|
||||||
|
}
|
||||||
|
return samples;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Load a 16-bit mono PCM WAV into [-1, 1] floats. */
|
||||||
|
private static float[] readWavMono16(String path) throws IOException {
|
||||||
|
File file = new File(path);
|
||||||
|
long fileLength = file.length();
|
||||||
|
try (DataInputStream in = new DataInputStream(new FileInputStream(file))) {
|
||||||
|
byte[] header = new byte[44];
|
||||||
|
in.readFully(header);
|
||||||
|
if (header[0] != 'R' || header[1] != 'I' || header[8] != 'W') {
|
||||||
|
throw new IOException("not a WAV file");
|
||||||
|
}
|
||||||
|
int channels = (header[22] & 0xff) | (header[23] << 8);
|
||||||
|
int bits = (header[34] & 0xff) | (header[35] << 8);
|
||||||
|
if (channels != 1 || bits != 16) {
|
||||||
|
throw new IOException("only 16-bit mono WAV is supported");
|
||||||
|
}
|
||||||
|
long dataBytes = fileLength - 44;
|
||||||
|
int count = (int) Math.min(dataBytes / 2, Integer.MAX_VALUE);
|
||||||
|
float[] samples = new float[count];
|
||||||
|
byte[] chunk = new byte[65536];
|
||||||
|
int sampleIndex = 0;
|
||||||
|
int carried = 0;
|
||||||
|
byte carriedByte = 0;
|
||||||
|
int read;
|
||||||
|
while (sampleIndex < count && (read = in.read(chunk)) > 0) {
|
||||||
|
int offset = 0;
|
||||||
|
if (carried == 1) {
|
||||||
|
samples[sampleIndex++] =
|
||||||
|
((short) ((carriedByte & 0xff) | (chunk[0] << 8))) / 32768.0f;
|
||||||
|
offset = 1;
|
||||||
|
carried = 0;
|
||||||
|
}
|
||||||
|
int pairs = (read - offset) / 2;
|
||||||
|
for (int i = 0; i < pairs && sampleIndex < count; i++) {
|
||||||
|
int base = offset + i * 2;
|
||||||
|
samples[sampleIndex++] =
|
||||||
|
((short) ((chunk[base] & 0xff) | (chunk[base + 1] << 8))) / 32768.0f;
|
||||||
|
}
|
||||||
|
if (((read - offset) & 1) == 1) {
|
||||||
|
carried = 1;
|
||||||
|
carriedByte = chunk[read - 1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return samples;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
-40
@@ -26,6 +26,10 @@ import java.util.concurrent.TimeUnit;
|
|||||||
* protobuf helpers (BleProtocol), but owns its own GATT connection and runs its
|
* protobuf helpers (BleProtocol), but owns its own GATT connection and runs its
|
||||||
* whole lifecycle on a single worker thread. It expects the main app to be
|
* whole lifecycle on a single worker thread. It expects the main app to be
|
||||||
* disconnected while it runs (onboarding, before flashing).
|
* disconnected while it runs (onboarding, before flashing).
|
||||||
|
*
|
||||||
|
* Only the right arm is used: the lenses relay messages to each other, so
|
||||||
|
* anything sent to the right arm reaches both, and acks/events only ever come
|
||||||
|
* from the right arm anyway.
|
||||||
*/
|
*/
|
||||||
public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
||||||
private static final String TAG = "FaceclawFlashPrompt";
|
private static final String TAG = "FaceclawFlashPrompt";
|
||||||
@@ -43,7 +47,6 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
|
|
||||||
private final Context context;
|
private final Context context;
|
||||||
private final String rightAddress;
|
private final String rightAddress;
|
||||||
private final String leftAddress;
|
|
||||||
private final String warningText;
|
private final String warningText;
|
||||||
private final FaceclawBleManager bleManager;
|
private final FaceclawBleManager bleManager;
|
||||||
private final Handler mainHandler = new Handler(Looper.getMainLooper());
|
private final Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||||
@@ -58,7 +61,6 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
private volatile boolean cancelled = false;
|
private volatile boolean cancelled = false;
|
||||||
private volatile boolean finished = false;
|
private volatile boolean finished = false;
|
||||||
private volatile boolean rightConnected = false;
|
private volatile boolean rightConnected = false;
|
||||||
private volatile boolean leftConnected = false;
|
|
||||||
private volatile boolean rightLost = false;
|
private volatile boolean rightLost = false;
|
||||||
private volatile Boolean approved = null;
|
private volatile Boolean approved = null;
|
||||||
private volatile ScheduledExecutorService heartbeatExecutor;
|
private volatile ScheduledExecutorService heartbeatExecutor;
|
||||||
@@ -66,10 +68,9 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
private int nextMagic = 100;
|
private int nextMagic = 100;
|
||||||
private int nextSeq = 0x40;
|
private int nextSeq = 0x40;
|
||||||
|
|
||||||
public FaceclawFlashPromptCommunicator(Context context, String rightAddress, String leftAddress, String warningText) {
|
public FaceclawFlashPromptCommunicator(Context context, String rightAddress, String warningText) {
|
||||||
this.context = context.getApplicationContext();
|
this.context = context.getApplicationContext();
|
||||||
this.rightAddress = rightAddress == null ? "" : rightAddress;
|
this.rightAddress = rightAddress == null ? "" : rightAddress;
|
||||||
this.leftAddress = leftAddress == null ? "" : leftAddress;
|
|
||||||
this.warningText = warningText == null ? "" : warningText;
|
this.warningText = warningText == null ? "" : warningText;
|
||||||
this.bleManager = new FaceclawBleManager(this.context);
|
this.bleManager = new FaceclawBleManager(this.context);
|
||||||
this.bleManager.setListener(this);
|
this.bleManager.setListener(this);
|
||||||
@@ -116,18 +117,8 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
emitState("connecting", "");
|
emitState("connecting", "");
|
||||||
connectArm(rightAddress, "right");
|
connectArm(rightAddress);
|
||||||
rightConnected = true;
|
rightConnected = true;
|
||||||
|
|
||||||
boolean haveLeft = !leftAddress.trim().isEmpty() && !leftAddress.equalsIgnoreCase(rightAddress);
|
|
||||||
if (haveLeft) {
|
|
||||||
try {
|
|
||||||
connectArm(leftAddress, "left");
|
|
||||||
leftConnected = true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
emitLog("left arm connect failed (continuing on right only): " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (cancelled) {
|
if (cancelled) {
|
||||||
teardown();
|
teardown();
|
||||||
return;
|
return;
|
||||||
@@ -135,14 +126,6 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
|
|
||||||
emitState("connected", "");
|
emitState("connected", "");
|
||||||
bringUpArm(rightAddress);
|
bringUpArm(rightAddress);
|
||||||
if (leftConnected) {
|
|
||||||
try {
|
|
||||||
bringUpArm(leftAddress);
|
|
||||||
} catch (Exception e) {
|
|
||||||
emitLog("left arm prompt failed (continuing on right only): " + e.getMessage());
|
|
||||||
leftConnected = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
startHeartbeat();
|
startHeartbeat();
|
||||||
emitState("prompting", "");
|
emitState("prompting", "");
|
||||||
@@ -158,7 +141,7 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
if (approved != null) {
|
if (approved != null) {
|
||||||
boolean result = Boolean.TRUE.equals(approved);
|
boolean result = Boolean.TRUE.equals(approved);
|
||||||
try {
|
try {
|
||||||
sendShutdownBoth();
|
sendShutdown();
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
}
|
}
|
||||||
emitResult(result);
|
emitResult(result);
|
||||||
@@ -182,7 +165,7 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void connectArm(String address, String labelForLog) {
|
private void connectArm(String address) {
|
||||||
if (!bleManager.connect(address, ConnectionOptions.CONNECT_TIMEOUT_MS)) {
|
if (!bleManager.connect(address, ConnectionOptions.CONNECT_TIMEOUT_MS)) {
|
||||||
throw new IllegalStateException("connect failed: " + address);
|
throw new IllegalStateException("connect failed: " + address);
|
||||||
}
|
}
|
||||||
@@ -194,7 +177,7 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
if (!bleManager.enableNotifications(address, BleProtocol.NOTIFY_CHAR_UUID, true, ConnectionOptions.DESCRIPTOR_TIMEOUT_MS)) {
|
if (!bleManager.enableNotifications(address, BleProtocol.NOTIFY_CHAR_UUID, true, ConnectionOptions.DESCRIPTOR_TIMEOUT_MS)) {
|
||||||
throw new IllegalStateException("enableNotifications failed: " + address);
|
throw new IllegalStateException("enableNotifications failed: " + address);
|
||||||
}
|
}
|
||||||
emitLog("connected " + labelForLog + " arm");
|
emitLog("connected right arm");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void bringUpArm(String address) throws InterruptedException {
|
private void bringUpArm(String address) throws InterruptedException {
|
||||||
@@ -301,9 +284,6 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
if (rightConnected) {
|
if (rightConnected) {
|
||||||
writeFrame(rightAddress, BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, heartbeat);
|
writeFrame(rightAddress, BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, heartbeat);
|
||||||
}
|
}
|
||||||
if (leftConnected) {
|
|
||||||
writeFrame(leftAddress, BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, heartbeat);
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.w(TAG, "heartbeat failed: " + e.getMessage());
|
Log.w(TAG, "heartbeat failed: " + e.getMessage());
|
||||||
}
|
}
|
||||||
@@ -317,14 +297,11 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendShutdownBoth() {
|
private void sendShutdown() {
|
||||||
byte[] shutdown = BleProtocol.buildShutdown(allocMagic(), 0);
|
byte[] shutdown = BleProtocol.buildShutdown(allocMagic(), 0);
|
||||||
if (rightConnected) {
|
if (rightConnected) {
|
||||||
writeFrame(rightAddress, BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, shutdown);
|
writeFrame(rightAddress, BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, shutdown);
|
||||||
}
|
}
|
||||||
if (leftConnected) {
|
|
||||||
writeFrame(leftAddress, BleProtocol.SID_EVENHUB, BleProtocol.FLAG_REQUEST, shutdown);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void teardown() {
|
private void teardown() {
|
||||||
@@ -335,7 +312,6 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
}
|
}
|
||||||
rightConnected = false;
|
rightConnected = false;
|
||||||
leftConnected = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -355,10 +331,7 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (frame.flag == BleProtocol.FLAG_NOTIFY || frame.flag == BleProtocol.FLAG_NOTIFY_ALT) {
|
if (frame.flag == BleProtocol.FLAG_NOTIFY || frame.flag == BleProtocol.FLAG_NOTIFY_ALT) {
|
||||||
// Async events (taps/selections) only ever come from the right arm.
|
handleEvent(frame);
|
||||||
if (address.equalsIgnoreCase(rightAddress)) {
|
|
||||||
handleEvent(frame);
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (frame.msgSeq >= 0) {
|
if (frame.msgSeq >= 0) {
|
||||||
@@ -407,8 +380,6 @@ public class FaceclawFlashPromptCommunicator implements FaceclawBleListener {
|
|||||||
selectionLatch.countDown();
|
selectionLatch.countDown();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (address.equalsIgnoreCase(leftAddress)) {
|
|
||||||
leftConnected = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ public class FaceclawLc3Decoder {
|
|||||||
public static final int COUNTER_OFFSET = 204;
|
public static final int COUNTER_OFFSET = 204;
|
||||||
public static final int SAMPLES_PER_FRAME = 160;
|
public static final int SAMPLES_PER_FRAME = 160;
|
||||||
public static final int SAMPLES_PER_PACKET = FRAMES_PER_PACKET * SAMPLES_PER_FRAME;
|
public static final int SAMPLES_PER_PACKET = FRAMES_PER_PACKET * SAMPLES_PER_FRAME;
|
||||||
|
// Trailer layout (firmware service_audio.c): after the 200 LC3 bytes the
|
||||||
|
// glasses DSP appends two signed 16-bit LE values computed on the raw
|
||||||
|
// stereo capture before the mono downmix — a signal-strength ratio and the
|
||||||
|
// asin-derived direction-of-arrival in degrees — then the packet counter.
|
||||||
|
public static final int SSR_OFFSET = 200;
|
||||||
|
public static final int ANGLE_OFFSET = 202;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
System.loadLibrary("faceclaw_lc3");
|
System.loadLibrary("faceclaw_lc3");
|
||||||
@@ -23,6 +29,8 @@ public class FaceclawLc3Decoder {
|
|||||||
private long duplicatePackets;
|
private long duplicatePackets;
|
||||||
private long missingPackets;
|
private long missingPackets;
|
||||||
private long decodeErrors;
|
private long decodeErrors;
|
||||||
|
private int lastSsr;
|
||||||
|
private int lastAngleDegrees;
|
||||||
|
|
||||||
public FaceclawLc3Decoder() {
|
public FaceclawLc3Decoder() {
|
||||||
nativeHandle = nativeCreate(FRAME_US, SAMPLE_RATE);
|
nativeHandle = nativeCreate(FRAME_US, SAMPLE_RATE);
|
||||||
@@ -64,9 +72,21 @@ public class FaceclawLc3Decoder {
|
|||||||
}
|
}
|
||||||
realPackets++;
|
realPackets++;
|
||||||
lastCounter = counter;
|
lastCounter = counter;
|
||||||
|
lastSsr = (short) ((packet[SSR_OFFSET] & 0xff) | (packet[SSR_OFFSET + 1] << 8));
|
||||||
|
lastAngleDegrees = (short) ((packet[ANGLE_OFFSET] & 0xff) | (packet[ANGLE_OFFSET + 1] << 8));
|
||||||
return decoded;
|
return decoded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Firmware signal-strength ratio from the most recent decoded packet. */
|
||||||
|
public synchronized int getLastSsr() {
|
||||||
|
return lastSsr;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Firmware direction-of-arrival (signed degrees) from the most recent decoded packet. */
|
||||||
|
public synchronized int getLastAngleDegrees() {
|
||||||
|
return lastAngleDegrees;
|
||||||
|
}
|
||||||
|
|
||||||
public synchronized long getRealPackets() {
|
public synchronized long getRealPackets() {
|
||||||
return realPackets;
|
return realPackets;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
public interface FaceclawMicStatusListener {
|
||||||
|
/**
|
||||||
|
* A CFW mic_control field-104 status record from one temple. body is the
|
||||||
|
* raw 21-byte ['M','C',ver,...] record (decoded on the TS side); arm is
|
||||||
|
* "L" or "R" for the temple's own BLE link, "?" if unmatched.
|
||||||
|
*/
|
||||||
|
void onMicStatus(byte[] body, String arm);
|
||||||
|
}
|
||||||
@@ -0,0 +1,266 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.media.audiofx.AcousticEchoCanceler;
|
||||||
|
import android.media.audiofx.AudioEffect;
|
||||||
|
import android.media.audiofx.AutomaticGainControl;
|
||||||
|
import android.media.audiofx.NoiseSuppressor;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phone-side noise suppression for the microphone stream.
|
||||||
|
*
|
||||||
|
* Android's built-in noise cancellation (the {@link NoiseSuppressor} capture
|
||||||
|
* effect) only attaches to AudioRecord sessions on the phone's own microphones. Faceclaw's audio
|
||||||
|
* arrives as raw PCM over BLE from the glasses, which that effect chain never
|
||||||
|
* sees, so this class picks the best engine that can actually reach the
|
||||||
|
* samples:
|
||||||
|
*
|
||||||
|
* - Audio captured by the phone itself: {@link #attachPlatformEffects(int)}
|
||||||
|
* enables the device's built-in NS/AEC/AGC chain (hardware or OEM software,
|
||||||
|
* whatever the Android build ships) on the AudioRecord session.
|
||||||
|
* - Audio from the glasses (the normal case): {@link #process(byte[])} runs a
|
||||||
|
* WebRTC-NS-family spectral suppressor here on the phone — 16 ms sqrt-Hann
|
||||||
|
* frames at 50% overlap, per-bin asymmetric noise-floor tracking, and an
|
||||||
|
* over-subtracted Wiener gain with a residual floor so speech never pumps
|
||||||
|
* in and out of silence.
|
||||||
|
*/
|
||||||
|
public final class FaceclawNoiseSuppressor {
|
||||||
|
|
||||||
|
private static final int FFT_SIZE = 256;
|
||||||
|
private static final int HOP = FFT_SIZE / 2;
|
||||||
|
private static final float OVERSUBTRACTION = 1.6f;
|
||||||
|
/** About -16 dB of residual: keeps the noise bed natural instead of gated. */
|
||||||
|
private static final float GAIN_FLOOR = 0.15f;
|
||||||
|
private static final float GAIN_SMOOTHING = 0.6f;
|
||||||
|
/** Frames of pure noise-floor learning after start/reset (~100 ms). */
|
||||||
|
private static final int NOISE_WARMUP_FRAMES = 12;
|
||||||
|
|
||||||
|
private final int sampleRate;
|
||||||
|
private final float[] window = new float[FFT_SIZE];
|
||||||
|
private final float[] history = new float[FFT_SIZE];
|
||||||
|
private final float[] overlap = new float[HOP];
|
||||||
|
private final float[] noise = new float[FFT_SIZE / 2 + 1];
|
||||||
|
private final float[] gain = new float[FFT_SIZE / 2 + 1];
|
||||||
|
private final float[] re = new float[FFT_SIZE];
|
||||||
|
private final float[] im = new float[FFT_SIZE];
|
||||||
|
private final short[] pending = new short[HOP];
|
||||||
|
private int pendingCount = 0;
|
||||||
|
private int warmupFrames = 0;
|
||||||
|
|
||||||
|
public FaceclawNoiseSuppressor(int sampleRate) {
|
||||||
|
this.sampleRate = sampleRate;
|
||||||
|
// sqrt-Hann (sine) analysis+synthesis windows: exact COLA at 50% overlap.
|
||||||
|
for (int i = 0; i < FFT_SIZE; i++) {
|
||||||
|
window[i] = (float) Math.sin(Math.PI * (i + 0.5) / FFT_SIZE);
|
||||||
|
}
|
||||||
|
reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSampleRate() {
|
||||||
|
return sampleRate;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Forget the learned noise floor (e.g. after the suppressor was toggled off). */
|
||||||
|
public void reset() {
|
||||||
|
Arrays.fill(history, 0f);
|
||||||
|
Arrays.fill(overlap, 0f);
|
||||||
|
Arrays.fill(noise, 0f);
|
||||||
|
Arrays.fill(gain, 1f);
|
||||||
|
pendingCount = 0;
|
||||||
|
warmupFrames = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Suppress noise in 16-bit little-endian mono PCM. Streaming: input not
|
||||||
|
* filling a whole 8 ms hop is carried into the next call, so the output
|
||||||
|
* may be up to one hop shorter than the input (and longer on a later
|
||||||
|
* call); total latency is one hop.
|
||||||
|
*/
|
||||||
|
public byte[] process(byte[] pcm16le) {
|
||||||
|
if (pcm16le == null || pcm16le.length < 2) {
|
||||||
|
return pcm16le;
|
||||||
|
}
|
||||||
|
int sampleCount = pcm16le.length / 2;
|
||||||
|
int hops = (pendingCount + sampleCount) / HOP;
|
||||||
|
byte[] out = new byte[hops * HOP * 2];
|
||||||
|
int outPos = 0;
|
||||||
|
int inPos = 0;
|
||||||
|
while (inPos < sampleCount) {
|
||||||
|
int take = Math.min(HOP - pendingCount, sampleCount - inPos);
|
||||||
|
for (int i = 0; i < take; i++) {
|
||||||
|
int lo = pcm16le[(inPos + i) * 2] & 0xff;
|
||||||
|
int hi = pcm16le[(inPos + i) * 2 + 1];
|
||||||
|
pending[pendingCount + i] = (short) ((hi << 8) | lo);
|
||||||
|
}
|
||||||
|
pendingCount += take;
|
||||||
|
inPos += take;
|
||||||
|
if (pendingCount == HOP) {
|
||||||
|
outPos = processHop(out, outPos);
|
||||||
|
pendingCount = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int processHop(byte[] out, int outPos) {
|
||||||
|
System.arraycopy(history, HOP, history, 0, FFT_SIZE - HOP);
|
||||||
|
for (int i = 0; i < HOP; i++) {
|
||||||
|
history[FFT_SIZE - HOP + i] = pending[i] / 32768f;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < FFT_SIZE; i++) {
|
||||||
|
re[i] = history[i] * window[i];
|
||||||
|
im[i] = 0f;
|
||||||
|
}
|
||||||
|
fft(re, im, false);
|
||||||
|
|
||||||
|
boolean warming = warmupFrames < NOISE_WARMUP_FRAMES;
|
||||||
|
if (warming) {
|
||||||
|
warmupFrames++;
|
||||||
|
}
|
||||||
|
for (int b = 0; b <= FFT_SIZE / 2; b++) {
|
||||||
|
float power = re[b] * re[b] + im[b] * im[b];
|
||||||
|
if (warming) {
|
||||||
|
noise[b] = warmupFrames == 1 ? power : noise[b] + (power - noise[b]) / warmupFrames;
|
||||||
|
} else if (power < noise[b]) {
|
||||||
|
// Track the floor down quickly; drift up slowly so speech
|
||||||
|
// energy never gets learned as noise.
|
||||||
|
noise[b] += (power - noise[b]) * 0.2f;
|
||||||
|
} else {
|
||||||
|
noise[b] = Math.min(power, noise[b] * 1.006f + 1e-10f);
|
||||||
|
}
|
||||||
|
float clean = power - OVERSUBTRACTION * noise[b];
|
||||||
|
float g = clean > 0f ? clean / power : 0f;
|
||||||
|
if (g < GAIN_FLOOR) {
|
||||||
|
g = GAIN_FLOOR;
|
||||||
|
}
|
||||||
|
g = GAIN_SMOOTHING * gain[b] + (1f - GAIN_SMOOTHING) * g;
|
||||||
|
gain[b] = g;
|
||||||
|
re[b] *= g;
|
||||||
|
im[b] *= g;
|
||||||
|
if (b > 0 && b < FFT_SIZE / 2) {
|
||||||
|
re[FFT_SIZE - b] *= g;
|
||||||
|
im[FFT_SIZE - b] *= g;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fft(re, im, true);
|
||||||
|
for (int i = 0; i < HOP; i++) {
|
||||||
|
float value = (overlap[i] + re[i] * window[i]) * 32767f;
|
||||||
|
int sample = Math.round(value);
|
||||||
|
if (sample > 32767) {
|
||||||
|
sample = 32767;
|
||||||
|
}
|
||||||
|
if (sample < -32768) {
|
||||||
|
sample = -32768;
|
||||||
|
}
|
||||||
|
out[outPos + i * 2] = (byte) (sample & 0xff);
|
||||||
|
out[outPos + i * 2 + 1] = (byte) ((sample >> 8) & 0xff);
|
||||||
|
}
|
||||||
|
for (int i = 0; i < HOP; i++) {
|
||||||
|
overlap[i] = re[HOP + i] * window[HOP + i];
|
||||||
|
}
|
||||||
|
return outPos + HOP * 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** In-place iterative radix-2 FFT (inverse includes the 1/N scale). */
|
||||||
|
private static void fft(float[] re, float[] im, boolean inverse) {
|
||||||
|
int n = re.length;
|
||||||
|
for (int i = 1, j = 0; i < n; i++) {
|
||||||
|
int bit = n >> 1;
|
||||||
|
for (; (j & bit) != 0; bit >>= 1) {
|
||||||
|
j ^= bit;
|
||||||
|
}
|
||||||
|
j ^= bit;
|
||||||
|
if (i < j) {
|
||||||
|
float t = re[i];
|
||||||
|
re[i] = re[j];
|
||||||
|
re[j] = t;
|
||||||
|
t = im[i];
|
||||||
|
im[i] = im[j];
|
||||||
|
im[j] = t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int len = 2; len <= n; len <<= 1) {
|
||||||
|
double ang = 2 * Math.PI / len * (inverse ? 1 : -1);
|
||||||
|
float wRe = (float) Math.cos(ang);
|
||||||
|
float wIm = (float) Math.sin(ang);
|
||||||
|
for (int i = 0; i < n; i += len) {
|
||||||
|
float curRe = 1f;
|
||||||
|
float curIm = 0f;
|
||||||
|
for (int k = 0; k < len / 2; k++) {
|
||||||
|
int a = i + k;
|
||||||
|
int b = a + len / 2;
|
||||||
|
float xr = re[b] * curRe - im[b] * curIm;
|
||||||
|
float xi = re[b] * curIm + im[b] * curRe;
|
||||||
|
re[b] = re[a] - xr;
|
||||||
|
im[b] = im[a] - xi;
|
||||||
|
re[a] += xr;
|
||||||
|
im[a] += xi;
|
||||||
|
float nextRe = curRe * wRe - curIm * wIm;
|
||||||
|
curIm = curRe * wIm + curIm * wRe;
|
||||||
|
curRe = nextRe;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (inverse) {
|
||||||
|
for (int i = 0; i < n; i++) {
|
||||||
|
re[i] /= n;
|
||||||
|
im[i] /= n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether this Android build ships the built-in capture noise suppressor. */
|
||||||
|
public static boolean platformSuppressorAvailable() {
|
||||||
|
try {
|
||||||
|
return NoiseSuppressor.isAvailable();
|
||||||
|
} catch (Throwable t) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Short engine name for the UI. */
|
||||||
|
public static String engineDescription() {
|
||||||
|
return "spectral (phone DSP)";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attach the platform's built-in capture-effect chain (NoiseSuppressor,
|
||||||
|
* AcousticEchoCanceler, AutomaticGainControl — whichever this Android
|
||||||
|
* build provides) to a phone AudioRecord session. Only applicable when the
|
||||||
|
* phone itself captures the audio; the BLE glasses stream must go through
|
||||||
|
* {@link #process(byte[])} instead. The caller keeps the returned effects
|
||||||
|
* for the life of the recording and release()s them with it.
|
||||||
|
*/
|
||||||
|
public static AudioEffect[] attachPlatformEffects(int audioSessionId) {
|
||||||
|
ArrayList<AudioEffect> effects = new ArrayList<>();
|
||||||
|
try {
|
||||||
|
if (NoiseSuppressor.isAvailable()) {
|
||||||
|
NoiseSuppressor ns = NoiseSuppressor.create(audioSessionId);
|
||||||
|
if (ns != null) {
|
||||||
|
ns.setEnabled(true);
|
||||||
|
effects.add(ns);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (AcousticEchoCanceler.isAvailable()) {
|
||||||
|
AcousticEchoCanceler aec = AcousticEchoCanceler.create(audioSessionId);
|
||||||
|
if (aec != null) {
|
||||||
|
aec.setEnabled(true);
|
||||||
|
effects.add(aec);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (AutomaticGainControl.isAvailable()) {
|
||||||
|
AutomaticGainControl agc = AutomaticGainControl.create(audioSessionId);
|
||||||
|
if (agc != null) {
|
||||||
|
agc.setEnabled(true);
|
||||||
|
effects.add(agc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
// A missing effect just means this tier is unavailable.
|
||||||
|
}
|
||||||
|
return effects.toArray(new AudioEffect[0]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Headless display target for preview-only mode (no glasses paired). Hosts
|
||||||
|
* the same SurfaceCompositor the BLE communicator uses, so the TS side can
|
||||||
|
* run its full surface/render pipeline unchanged; composited frames simply
|
||||||
|
* have nowhere to go, and the phone-mirror preview, screenshots, and GIF
|
||||||
|
* recordings read the retained composite back exactly as they do on a live
|
||||||
|
* connection.
|
||||||
|
*
|
||||||
|
* The method signatures mirror the display subset of FaceclawBleCommunicator
|
||||||
|
* (the TS DisplayTarget interface is typed against that subset).
|
||||||
|
*/
|
||||||
|
public final class FaceclawPreviewCompositor {
|
||||||
|
private final Context appContext;
|
||||||
|
private final SurfaceCompositor compositor = new SurfaceCompositor();
|
||||||
|
private final android.os.Handler mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
|
||||||
|
|
||||||
|
// Notified (on the main looper, where the phone UI's JS runs) after each
|
||||||
|
// applied surface frame, standing in for the BLE path's per-frame metrics
|
||||||
|
// callback so the phone mirror refreshes promptly instead of waiting for
|
||||||
|
// its safety-net poll.
|
||||||
|
private volatile Runnable frameListener;
|
||||||
|
|
||||||
|
// Active animated-GIF screen recording, or null when idle. Frames are
|
||||||
|
// pushed by recordScreenFrame(), which the TS side calls at each
|
||||||
|
// phone-preview flush.
|
||||||
|
private volatile GifScreenRecorder screenRecorder;
|
||||||
|
|
||||||
|
// Worker-app isolates locate their frame target through a static, like
|
||||||
|
// FaceclawBleCommunicator.getActive(); Java statics are shared across
|
||||||
|
// isolates, unlike anything on the JS side.
|
||||||
|
private static volatile FaceclawPreviewCompositor activeInstance;
|
||||||
|
|
||||||
|
public static FaceclawPreviewCompositor getActive() {
|
||||||
|
return activeInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FaceclawPreviewCompositor(Context context) {
|
||||||
|
this.appContext = context.getApplicationContext();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Publish this compositor as the workers' frame target. */
|
||||||
|
public void makeActive() {
|
||||||
|
activeInstance = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Withdraw from workers (a real connection is taking over). */
|
||||||
|
public void release() {
|
||||||
|
if (activeInstance == this) {
|
||||||
|
activeInstance = null;
|
||||||
|
}
|
||||||
|
frameListener = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFrameListener(Runnable listener) {
|
||||||
|
this.frameListener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Set the compositor's output frame size. Call before configuring surfaces. */
|
||||||
|
public void configureCompositorScreen(int width, int height) {
|
||||||
|
compositor.configureScreen(width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void configureSurface(String id, int x, int y, int width, int height, int zOrder, int transparency) {
|
||||||
|
compositor.configureSurface(id, x, y, width, height, zOrder, transparency);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void removeSurface(String id) {
|
||||||
|
compositor.removeSurface(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSurfaceVisible(String id, boolean visible) {
|
||||||
|
compositor.setSurfaceVisible(id, visible);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Blank (screen off) or unblank the output; retained surface state survives. */
|
||||||
|
public void setScreenBlanked(boolean blanked) {
|
||||||
|
compositor.setBlanked(blanked);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply an update to one compositor surface. Unlike the connected path
|
||||||
|
* there is no desired-frame store or transmit pipeline downstream; the
|
||||||
|
* preview/screenshot calls recomposite the retained state on demand, so
|
||||||
|
* applying the update is the whole job and the frame finishes here.
|
||||||
|
*/
|
||||||
|
public void submitSurfaceFrame(
|
||||||
|
java.nio.ByteBuffer pixels8bpp,
|
||||||
|
String surfaceId,
|
||||||
|
int rectX,
|
||||||
|
int rectY,
|
||||||
|
int rectWidth,
|
||||||
|
int rectHeight,
|
||||||
|
String contentFingerprint,
|
||||||
|
int paintMs,
|
||||||
|
int frameId,
|
||||||
|
java.nio.ByteBuffer glyphs
|
||||||
|
) {
|
||||||
|
compositor.applyAndComposite(
|
||||||
|
surfaceId, pixels8bpp, rectX, rectY, rectWidth, rectHeight, contentFingerprint, glyphs);
|
||||||
|
FrameTimings.getInstance().finishFrame(frameId, "composited (preview-only, no glasses)");
|
||||||
|
Runnable listener = frameListener;
|
||||||
|
if (listener != null) {
|
||||||
|
mainHandler.post(listener);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The current composited screen as a phone-UI preview bitmap, or null
|
||||||
|
* before any surface has been configured.
|
||||||
|
*/
|
||||||
|
public android.graphics.Bitmap getCompositePreviewBitmap(double brightenGamma, boolean green) {
|
||||||
|
SurfaceCompositor.Composite composite = compositor.previewComposite();
|
||||||
|
if (composite == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return PreviewBitmapUtil.fromGray(
|
||||||
|
java.nio.ByteBuffer.wrap(composite.gray), composite.width, composite.height, brightenGamma, green);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Save the current composite as a 4-bit grayscale PNG; returns the path or "". */
|
||||||
|
public String saveCompositePngScreenshot() throws java.io.IOException {
|
||||||
|
SurfaceCompositor.Composite composite = compositor.previewComposite();
|
||||||
|
if (composite == null) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return ScreenshotUtil.savePngScreenshot(appContext, composite.gray, composite.width, composite.height);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save the current composite cropped to the given screen rect (the region
|
||||||
|
* the shell says is actually occupied). The rect is clamped to the screen;
|
||||||
|
* a degenerate rect falls back to the full screen.
|
||||||
|
*/
|
||||||
|
public String saveCompositePngScreenshot(int cropX, int cropY, int cropWidth, int cropHeight)
|
||||||
|
throws java.io.IOException {
|
||||||
|
SurfaceCompositor.Composite composite = compositor.previewComposite();
|
||||||
|
if (composite == null) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
int x = Math.max(0, cropX);
|
||||||
|
int y = Math.max(0, cropY);
|
||||||
|
int width = Math.min(composite.width - x, cropWidth - (x - cropX));
|
||||||
|
int height = Math.min(composite.height - y, cropHeight - (y - cropY));
|
||||||
|
if (width <= 0 || height <= 0 || (x == 0 && y == 0 && width == composite.width && height == composite.height)) {
|
||||||
|
return ScreenshotUtil.savePngScreenshot(appContext, composite.gray, composite.width, composite.height);
|
||||||
|
}
|
||||||
|
byte[] cropped = new byte[width * height];
|
||||||
|
for (int row = 0; row < height; row++) {
|
||||||
|
System.arraycopy(composite.gray, (y + row) * composite.width + x, cropped, row * width, width);
|
||||||
|
}
|
||||||
|
return ScreenshotUtil.savePngScreenshot(appContext, cropped, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Begin collecting composite frames for an animated-GIF screen recording. */
|
||||||
|
public void startScreenRecording() {
|
||||||
|
screenRecorder = new GifScreenRecorder();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Capture the current composite into the active recording; no-op when idle. */
|
||||||
|
public void recordScreenFrame() {
|
||||||
|
GifScreenRecorder recorder = screenRecorder;
|
||||||
|
if (recorder == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
SurfaceCompositor.Composite composite = compositor.previewComposite();
|
||||||
|
if (composite == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
recorder.addFrame(composite.gray, composite.width, composite.height, System.currentTimeMillis());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Finish the recording and save it as an animated GIF; returns the path or "". */
|
||||||
|
public String stopScreenRecording() throws java.io.IOException {
|
||||||
|
GifScreenRecorder recorder = screenRecorder;
|
||||||
|
screenRecorder = null;
|
||||||
|
if (recorder == null) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return recorder.save(appContext);
|
||||||
|
}
|
||||||
|
}
|
||||||
+141
@@ -0,0 +1,141 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.util.Xml;
|
||||||
|
|
||||||
|
import org.xmlpull.v1.XmlPullParser;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* adb-triggered export/import of the faceclaw_settings SharedPreferences
|
||||||
|
* file, so configuration (API keys, device addresses, ...) can be moved off a
|
||||||
|
* release build, where run-as is unavailable. See scripts/pull_config.sh and
|
||||||
|
* scripts/push_config.sh, which use run-as on debuggable builds and fall back
|
||||||
|
* to this receiver otherwise.
|
||||||
|
*
|
||||||
|
* adb shell am broadcast -n com.faceclaw.app/.FaceclawSettingsPortReceiver \
|
||||||
|
* -a com.faceclaw.app.SETTINGS_EXPORT
|
||||||
|
* adb pull /sdcard/Android/data/com.faceclaw.app/files/faceclaw-settings-export.xml
|
||||||
|
*
|
||||||
|
* adb push settings.xml /sdcard/Android/data/com.faceclaw.app/files/faceclaw-settings-import.xml
|
||||||
|
* adb shell am broadcast -n com.faceclaw.app/.FaceclawSettingsPortReceiver \
|
||||||
|
* -a com.faceclaw.app.SETTINGS_IMPORT
|
||||||
|
*
|
||||||
|
* Security: the settings file contains API tokens, so the manifest guards
|
||||||
|
* this receiver with android.permission.DUMP — a development permission the
|
||||||
|
* adb shell holds but ordinary apps cannot obtain without adb's help, keeping
|
||||||
|
* the trigger reachable from adb only. The transfer file lives in
|
||||||
|
* getExternalFilesDir(), which other apps cannot read on Android 11+ (and
|
||||||
|
* which the scripts delete as soon as the transfer completes); on the
|
||||||
|
* Android 7-10 devices minSdk still admits, apps holding READ_EXTERNAL_STORAGE
|
||||||
|
* could read it during that window.
|
||||||
|
*/
|
||||||
|
public class FaceclawSettingsPortReceiver extends BroadcastReceiver {
|
||||||
|
private static final String TAG = "FaceclawSettingsPort";
|
||||||
|
public static final String ACTION_EXPORT = "com.faceclaw.app.SETTINGS_EXPORT";
|
||||||
|
public static final String ACTION_IMPORT = "com.faceclaw.app.SETTINGS_IMPORT";
|
||||||
|
private static final String PREFS_FILE = "faceclaw_settings.xml";
|
||||||
|
private static final String EXPORT_NAME = "faceclaw-settings-export.xml";
|
||||||
|
private static final String IMPORT_NAME = "faceclaw-settings-import.xml";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
String action = intent == null ? null : intent.getAction();
|
||||||
|
try {
|
||||||
|
if (ACTION_EXPORT.equals(action)) {
|
||||||
|
setResultData(exportSettings(context));
|
||||||
|
} else if (ACTION_IMPORT.equals(action)) {
|
||||||
|
setResultData(importSettings(context));
|
||||||
|
// Exit once the broadcast result has been delivered: this
|
||||||
|
// process may hold stale in-memory SharedPreferences that a
|
||||||
|
// later apply() would flush over the imported file, and the
|
||||||
|
// next launch must re-read from disk.
|
||||||
|
new Handler(Looper.getMainLooper()).postDelayed(() -> {
|
||||||
|
Log.i(TAG, "Exiting after settings import");
|
||||||
|
System.exit(0);
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "Settings " + action + " failed", e);
|
||||||
|
setResultData("error: " + e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private File prefsFile(Context context) {
|
||||||
|
return new File(context.getApplicationInfo().dataDir, "shared_prefs/" + PREFS_FILE);
|
||||||
|
}
|
||||||
|
|
||||||
|
private File externalFile(Context context, String name) throws IOException {
|
||||||
|
File dir = context.getExternalFilesDir(null);
|
||||||
|
if (dir == null) {
|
||||||
|
throw new IOException("external files dir unavailable");
|
||||||
|
}
|
||||||
|
return new File(dir, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String exportSettings(Context context) throws IOException {
|
||||||
|
File prefs = prefsFile(context);
|
||||||
|
if (!prefs.exists()) {
|
||||||
|
return "error: no settings file yet (" + prefs + ")";
|
||||||
|
}
|
||||||
|
File out = externalFile(context, EXPORT_NAME);
|
||||||
|
copy(prefs, out);
|
||||||
|
return "exported: " + out;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String importSettings(Context context) throws Exception {
|
||||||
|
File staged = externalFile(context, IMPORT_NAME);
|
||||||
|
if (!staged.exists()) {
|
||||||
|
return "error: nothing staged at " + staged;
|
||||||
|
}
|
||||||
|
validatePrefsXml(staged);
|
||||||
|
File prefs = prefsFile(context);
|
||||||
|
prefs.getParentFile().mkdirs();
|
||||||
|
if (prefs.exists()) {
|
||||||
|
copy(prefs, new File(prefs.getPath() + ".bak"));
|
||||||
|
}
|
||||||
|
copy(staged, prefs);
|
||||||
|
staged.delete();
|
||||||
|
return "imported: " + prefs + " (previous settings in " + PREFS_FILE + ".bak)";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Reject files that are not a SharedPreferences <map> document. */
|
||||||
|
private void validatePrefsXml(File file) throws Exception {
|
||||||
|
try (InputStream in = new FileInputStream(file)) {
|
||||||
|
XmlPullParser parser = Xml.newPullParser();
|
||||||
|
parser.setInput(in, null);
|
||||||
|
int event = parser.next();
|
||||||
|
while (event != XmlPullParser.START_TAG && event != XmlPullParser.END_DOCUMENT) {
|
||||||
|
event = parser.next();
|
||||||
|
}
|
||||||
|
if (event != XmlPullParser.START_TAG || !"map".equals(parser.getName())) {
|
||||||
|
throw new IOException("not a SharedPreferences <map> document");
|
||||||
|
}
|
||||||
|
// Walk the rest so malformed XML is caught before it replaces
|
||||||
|
// the live settings file.
|
||||||
|
while (parser.next() != XmlPullParser.END_DOCUMENT) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void copy(File from, File to) throws IOException {
|
||||||
|
try (InputStream in = new FileInputStream(from);
|
||||||
|
OutputStream out = new FileOutputStream(to)) {
|
||||||
|
byte[] buffer = new byte[8192];
|
||||||
|
int n;
|
||||||
|
while ((n = in.read(buffer)) > 0) {
|
||||||
|
out.write(buffer, 0, n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.k2fsa.sherpa.onnx.OnlineStream;
|
||||||
|
import com.k2fsa.sherpa.onnx.SpeakerEmbeddingExtractor;
|
||||||
|
import com.k2fsa.sherpa.onnx.SpeakerEmbeddingExtractorConfig;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Speaker voice-print extraction over sherpa-onnx. One embedding per
|
||||||
|
* utterance; matching/enrollment happens on the TS side (cosine similarity
|
||||||
|
* against the stored speaker profiles).
|
||||||
|
*/
|
||||||
|
public class FaceclawSpeakerId {
|
||||||
|
private static final String TAG = "FaceclawSpeakerId";
|
||||||
|
|
||||||
|
private SpeakerEmbeddingExtractor extractor;
|
||||||
|
private final String modelPath;
|
||||||
|
|
||||||
|
public FaceclawSpeakerId(String modelPath) {
|
||||||
|
this.modelPath = modelPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Lazily loads the model; returns false when it cannot be loaded. */
|
||||||
|
public synchronized boolean ensureLoaded() {
|
||||||
|
if (extractor != null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
SpeakerEmbeddingExtractorConfig config = SpeakerEmbeddingExtractorConfig.builder()
|
||||||
|
.setModel(modelPath)
|
||||||
|
.setNumThreads(1)
|
||||||
|
.setDebug(false)
|
||||||
|
.setProvider("cpu")
|
||||||
|
.build();
|
||||||
|
extractor = new SpeakerEmbeddingExtractor(config);
|
||||||
|
return true;
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "could not load speaker model at " + modelPath, t);
|
||||||
|
extractor = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized int embeddingDim() {
|
||||||
|
return extractor == null ? 0 : extractor.getDim();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compute an L2-normalized voice-print for one utterance of 16 kHz mono
|
||||||
|
* S16LE PCM. Returns null when the model is unavailable or the utterance
|
||||||
|
* is too short to embed (under ~0.5 s).
|
||||||
|
*/
|
||||||
|
public synchronized float[] embed(byte[] pcm16le, int sampleRate) {
|
||||||
|
if (pcm16le == null || pcm16le.length < sampleRate) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (!ensureLoaded()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
int count = pcm16le.length / 2;
|
||||||
|
float[] samples = new float[count];
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
short s = (short) ((pcm16le[i * 2] & 0xff) | (pcm16le[i * 2 + 1] << 8));
|
||||||
|
samples[i] = s / 32768.0f;
|
||||||
|
}
|
||||||
|
OnlineStream stream = null;
|
||||||
|
try {
|
||||||
|
stream = extractor.createStream();
|
||||||
|
stream.acceptWaveform(samples, sampleRate);
|
||||||
|
stream.inputFinished();
|
||||||
|
if (!extractor.isReady(stream)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
float[] embedding = extractor.compute(stream);
|
||||||
|
return l2Normalize(embedding);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "embedding failed", t);
|
||||||
|
return null;
|
||||||
|
} finally {
|
||||||
|
if (stream != null) {
|
||||||
|
stream.release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float[] l2Normalize(float[] v) {
|
||||||
|
if (v == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
double sum = 0;
|
||||||
|
for (float x : v) {
|
||||||
|
sum += (double) x * x;
|
||||||
|
}
|
||||||
|
double norm = Math.sqrt(sum);
|
||||||
|
if (norm <= 0) {
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < v.length; i++) {
|
||||||
|
v[i] = (float) (v[i] / norm);
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized void close() {
|
||||||
|
if (extractor != null) {
|
||||||
|
extractor.release();
|
||||||
|
extractor = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+365
-25
@@ -76,6 +76,15 @@ public class FaceclawVoiceController {
|
|||||||
private volatile FaceclawBleCommunicator communicator;
|
private volatile FaceclawBleCommunicator communicator;
|
||||||
private Thread workerThread;
|
private Thread workerThread;
|
||||||
private volatile boolean started;
|
private volatile boolean started;
|
||||||
|
// Set once the worker has the glasses mic enabled for this session.
|
||||||
|
// Read and written under `lock`, so it flips with `started` atomically.
|
||||||
|
private boolean audioStarted;
|
||||||
|
// Capture from the phone's own microphone instead of the G2 over BLE
|
||||||
|
// (preview-only mode, where no glasses are connected). Latched into
|
||||||
|
// activePhoneMic at start() (under `lock`) so a mid-session setter call
|
||||||
|
// can't switch pipelines underneath the worker.
|
||||||
|
private volatile boolean usePhoneMic;
|
||||||
|
private boolean activePhoneMic;
|
||||||
private VoiceInputMode mode = VoiceInputMode.CLOUD;
|
private VoiceInputMode mode = VoiceInputMode.CLOUD;
|
||||||
private OfflineRecognizer recognizer;
|
private OfflineRecognizer recognizer;
|
||||||
private FaceclawLc3Decoder lc3Decoder;
|
private FaceclawLc3Decoder lc3Decoder;
|
||||||
@@ -90,6 +99,26 @@ public class FaceclawVoiceController {
|
|||||||
private volatile boolean endpointing;
|
private volatile boolean endpointing;
|
||||||
private final EndpointDetector endpointDetector = new EndpointDetector();
|
private final EndpointDetector endpointDetector = new EndpointDetector();
|
||||||
private java.io.ByteArrayOutputStream recordingPcm;
|
private java.io.ByteArrayOutputStream recordingPcm;
|
||||||
|
// Speaker verification against the enrolled wearer voice-print ("my voice
|
||||||
|
// only" command gating). Configured before start(); the utterance PCM is
|
||||||
|
// buffered (capped) and verified once at session end.
|
||||||
|
private static final int VERIFY_MAX_SAMPLES = SAMPLE_RATE * 10;
|
||||||
|
private static final int VERIFY_MIN_SAMPLES = SAMPLE_RATE;
|
||||||
|
private volatile String verifySpeakerModelPath;
|
||||||
|
private volatile float[] verifyWearerEmbedding;
|
||||||
|
private volatile float verifyThreshold = 0.8f;
|
||||||
|
private short[] verifyBuffer;
|
||||||
|
private int verifyCount;
|
||||||
|
// Global mic processing (Microphones app config): spectral noise
|
||||||
|
// suppression and firmware-DoA beam gating, applied to every capture
|
||||||
|
// session that opts in (assistant push-to-talk, Transcribe, hands-free).
|
||||||
|
// The raw tap opts out — raw means raw, and the Microphones session does
|
||||||
|
// its own beam-compensated processing on that path.
|
||||||
|
private volatile boolean suppressionEnabled;
|
||||||
|
private volatile boolean beamFilterEnabled;
|
||||||
|
private volatile int beamCenterDeg;
|
||||||
|
private volatile int beamHalfWidthDeg = 180;
|
||||||
|
private FaceclawNoiseSuppressor suppressor;
|
||||||
private long queuedPackets;
|
private long queuedPackets;
|
||||||
private long queueDroppedPackets;
|
private long queueDroppedPackets;
|
||||||
private long decodedSamples;
|
private long decodedSamples;
|
||||||
@@ -111,6 +140,11 @@ public class FaceclawVoiceController {
|
|||||||
this.communicator = communicator;
|
this.communicator = communicator;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Source the next capture from the phone microphone (no glasses paired). */
|
||||||
|
public void setUsePhoneMic(boolean usePhoneMic) {
|
||||||
|
this.usePhoneMic = usePhoneMic;
|
||||||
|
}
|
||||||
|
|
||||||
/** When true, the decoded mic PCM for each session is saved as a WAV. */
|
/** When true, the decoded mic PCM for each session is saved as a WAV. */
|
||||||
public void setSaveRecordings(boolean saveRecordings) {
|
public void setSaveRecordings(boolean saveRecordings) {
|
||||||
this.saveRecordings = saveRecordings;
|
this.saveRecordings = saveRecordings;
|
||||||
@@ -125,23 +159,117 @@ public class FaceclawVoiceController {
|
|||||||
this.endpointing = endpointing;
|
this.endpointing = endpointing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verify this session's speaker against the enrolled wearer voice-print
|
||||||
|
* and report the result via onSpeakerVerified just before the final
|
||||||
|
* transcript. Must be set before {@link #start}; pass a null model path
|
||||||
|
* to disable.
|
||||||
|
*/
|
||||||
|
public void setSpeakerVerification(String speakerModelPath, float[] wearerEmbedding, float threshold) {
|
||||||
|
this.verifySpeakerModelPath = speakerModelPath;
|
||||||
|
this.verifyWearerEmbedding = wearerEmbedding;
|
||||||
|
this.verifyThreshold = threshold > 0 ? threshold : 0.8f;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clearSpeakerVerification() {
|
||||||
|
this.verifySpeakerModelPath = null;
|
||||||
|
this.verifyWearerEmbedding = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Spectral noise suppression on the decoded stream. Safe to flip mid-run. */
|
||||||
|
public void setNoiseSuppression(boolean enabled) {
|
||||||
|
this.suppressionEnabled = enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Direction gating from the Sonic Radar beam: packets whose firmware
|
||||||
|
* direction-of-arrival falls outside centerDeg ± halfWidthDeg (device
|
||||||
|
* frame, 0 = straight ahead, positive right) are dropped before any
|
||||||
|
* consumer sees them. Safe to update mid-run.
|
||||||
|
*/
|
||||||
|
public void setBeamFilter(boolean enabled, int centerDeg, int halfWidthDeg) {
|
||||||
|
this.beamFilterEnabled = enabled;
|
||||||
|
this.beamCenterDeg = centerDeg;
|
||||||
|
this.beamHalfWidthDeg = Math.max(5, Math.min(180, halfWidthDeg));
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean withinBeam(int angleDegrees) {
|
||||||
|
int delta = angleDegrees - beamCenterDeg;
|
||||||
|
while (delta > 180) delta -= 360;
|
||||||
|
while (delta < -180) delta += 360;
|
||||||
|
return Math.abs(delta) <= beamHalfWidthDeg;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void applySuppression(short[] pcm, int count) {
|
||||||
|
try {
|
||||||
|
if (suppressor == null) {
|
||||||
|
suppressor = new FaceclawNoiseSuppressor(SAMPLE_RATE);
|
||||||
|
}
|
||||||
|
byte[] le = new byte[count * 2];
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
le[i * 2] = (byte) (pcm[i] & 0xff);
|
||||||
|
le[i * 2 + 1] = (byte) ((pcm[i] >> 8) & 0xff);
|
||||||
|
}
|
||||||
|
byte[] cleaned = suppressor.process(le);
|
||||||
|
int cleanedCount = Math.min(count, cleaned.length / 2);
|
||||||
|
for (int i = 0; i < cleanedCount; i++) {
|
||||||
|
pcm[i] = (short) ((cleaned[i * 2] & 0xff) | (cleaned[i * 2 + 1] << 8));
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "noise suppression failed; passing audio through", t);
|
||||||
|
suppressionEnabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void start(String requestedMode) {
|
public void start(String requestedMode) {
|
||||||
synchronized (lock) {
|
synchronized (lock) {
|
||||||
if (started) {
|
if (started) {
|
||||||
emitStatus("Voice control is already listening.");
|
emitStatus("Voice control is already listening.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (communicator == null || !communicator.isSessionReady()) {
|
if (!usePhoneMic && (communicator == null || !communicator.isSessionReady())) {
|
||||||
emitStatus("Voice control needs an active G2 connection.");
|
emitStatus("Voice control needs an active G2 connection.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
mode = parseMode(requestedMode);
|
mode = parseMode(requestedMode);
|
||||||
|
activePhoneMic = usePhoneMic;
|
||||||
started = true;
|
started = true;
|
||||||
|
audioStarted = false;
|
||||||
workerThread = new Thread(this::runLoop, "FaceclawVoiceController");
|
workerThread = new Thread(this::runLoop, "FaceclawVoiceController");
|
||||||
workerThread.start();
|
workerThread.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether mic audio is actually flowing. {@link #start} only records
|
||||||
|
* intent: the enable lives in the glasses' EvenHub session, so a transport
|
||||||
|
* drop or a session suspend can leave this controller started with a
|
||||||
|
* worker that will never see another packet. Anything deciding whether to
|
||||||
|
* (re)start capture must ask this rather than assume its own bookkeeping.
|
||||||
|
*/
|
||||||
|
public boolean isCapturing() {
|
||||||
|
boolean audioUp;
|
||||||
|
boolean phoneMic;
|
||||||
|
synchronized (lock) {
|
||||||
|
if (!started) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
audioUp = audioStarted;
|
||||||
|
phoneMic = activePhoneMic;
|
||||||
|
}
|
||||||
|
if (!audioUp) {
|
||||||
|
// The worker is still bringing the mic up; report it as running so
|
||||||
|
// a concurrent request shares it instead of restarting it.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (phoneMic) {
|
||||||
|
// AudioRecord has no session to lose the enable to; it runs until stop().
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
FaceclawBleCommunicator currentCommunicator = communicator;
|
||||||
|
return currentCommunicator != null && currentCommunicator.isAudioCaptureActive();
|
||||||
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
Thread threadToJoin;
|
Thread threadToJoin;
|
||||||
synchronized (lock) {
|
synchronized (lock) {
|
||||||
@@ -193,18 +321,54 @@ public class FaceclawVoiceController {
|
|||||||
resetTranscriptState();
|
resetTranscriptState();
|
||||||
lastTranscript = "";
|
lastTranscript = "";
|
||||||
}
|
}
|
||||||
lc3Decoder = new FaceclawLc3Decoder();
|
|
||||||
endpointDetector.reset();
|
endpointDetector.reset();
|
||||||
recordingPcm = saveRecordings ? new java.io.ByteArrayOutputStream(SAMPLE_RATE * 2 * 4) : null;
|
if (suppressor != null) {
|
||||||
if (!startG2Audio()) {
|
suppressor.reset();
|
||||||
emitStatus("Could not start G2 microphone input.");
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
recordingPcm = saveRecordings ? new java.io.ByteArrayOutputStream(SAMPLE_RATE * 2 * 4) : null;
|
||||||
emitStatus(currentMode == VoiceInputMode.CLOUD
|
boolean verifying = verifySpeakerModelPath != null && verifyWearerEmbedding != null;
|
||||||
? "Listening (cloud)..."
|
verifyBuffer = verifying ? new short[VERIFY_MAX_SAMPLES] : null;
|
||||||
: "Listening...");
|
verifyCount = 0;
|
||||||
processG2Audio();
|
if (activePhoneMic) {
|
||||||
|
android.media.AudioRecord record = openPhoneMic();
|
||||||
|
if (record == null) {
|
||||||
|
emitStatus("Could not start the phone microphone.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
synchronized (lock) {
|
||||||
|
audioStarted = true;
|
||||||
|
}
|
||||||
|
emitStatus(currentMode == VoiceInputMode.CLOUD
|
||||||
|
? "Listening (cloud)..."
|
||||||
|
: "Listening...");
|
||||||
|
try {
|
||||||
|
processPhoneAudio(record);
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
record.stop();
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
// Already stopped or never recording; release below either way.
|
||||||
|
}
|
||||||
|
record.release();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
lc3Decoder = new FaceclawLc3Decoder();
|
||||||
|
if (!startG2Audio()) {
|
||||||
|
emitStatus("Could not start G2 microphone input.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
synchronized (lock) {
|
||||||
|
audioStarted = true;
|
||||||
|
}
|
||||||
|
emitStatus(currentMode == VoiceInputMode.CLOUD
|
||||||
|
? "Listening (cloud)..."
|
||||||
|
: "Listening...");
|
||||||
|
processG2Audio();
|
||||||
|
}
|
||||||
|
// Verification result must precede the final transcript so the
|
||||||
|
// TS bridge can suppress a non-wearer command before it is acted
|
||||||
|
// on (the callbacks are posted in order to the main handler).
|
||||||
|
runSpeakerVerification();
|
||||||
// Button released / stop requested: emit one final full-utterance
|
// Button released / stop requested: emit one final full-utterance
|
||||||
// transcript so the UI can freeze it.
|
// transcript so the UI can freeze it.
|
||||||
if (currentMode == VoiceInputMode.ONBOARD) {
|
if (currentMode == VoiceInputMode.ONBOARD) {
|
||||||
@@ -220,6 +384,7 @@ public class FaceclawVoiceController {
|
|||||||
releaseLc3();
|
releaseLc3();
|
||||||
synchronized (lock) {
|
synchronized (lock) {
|
||||||
started = false;
|
started = false;
|
||||||
|
audioStarted = false;
|
||||||
workerThread = null;
|
workerThread = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -374,25 +539,123 @@ public class FaceclawVoiceController {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
decodedSamples += count;
|
decodedSamples += count;
|
||||||
if (recordingPcm != null) {
|
// Global mic processing from the Microphones app config: the
|
||||||
appendRecording(pcm, count);
|
// beam filter drops packets whose firmware direction-of-arrival
|
||||||
}
|
// falls outside the listening wedge (isolating the aimed talker
|
||||||
if (endpointing && endpointDetector.accept(pcm, count)) {
|
// for every consumer, recognition included), and the spectral
|
||||||
emitSpeechEnd();
|
// noise suppressor cleans what remains before it reaches the
|
||||||
}
|
// recognizer, cloud PCM, endpointing, or speaker verification.
|
||||||
if (mode == VoiceInputMode.CLOUD) {
|
int angleDegrees = currentDecoder.getLastAngleDegrees();
|
||||||
emitPcm(pcm, count);
|
int ssr = currentDecoder.getLastSsr();
|
||||||
} else {
|
if (beamFilterEnabled && ssr > 0 && !withinBeam(angleDegrees)) {
|
||||||
float[] samples = new float[count];
|
emitFrameMeta(angleDegrees, ssr);
|
||||||
for (int i = 0; i < count; i++) {
|
maybeEmitAudioStats(false);
|
||||||
samples[i] = pcm[i] / 32768.0f;
|
continue;
|
||||||
}
|
|
||||||
processRecognizer(samples);
|
|
||||||
}
|
}
|
||||||
|
processPcmChunk(pcm, count, angleDegrees, ssr, true);
|
||||||
maybeEmitAudioStats(false);
|
maybeEmitAudioStats(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Per-chunk processing shared by the G2 and phone-mic paths, downstream of
|
||||||
|
* decode and the beam filter. hasFrameMeta is false for the phone mic,
|
||||||
|
* which has no firmware DSP metadata to report.
|
||||||
|
*/
|
||||||
|
private void processPcmChunk(short[] pcm, int count, int angleDegrees, int ssr, boolean hasFrameMeta) {
|
||||||
|
if (suppressionEnabled) {
|
||||||
|
applySuppression(pcm, count);
|
||||||
|
}
|
||||||
|
if (recordingPcm != null) {
|
||||||
|
appendRecording(pcm, count);
|
||||||
|
}
|
||||||
|
if (verifyBuffer != null && verifyCount < VERIFY_MAX_SAMPLES) {
|
||||||
|
int copied = Math.min(count, VERIFY_MAX_SAMPLES - verifyCount);
|
||||||
|
System.arraycopy(pcm, 0, verifyBuffer, verifyCount, copied);
|
||||||
|
verifyCount += copied;
|
||||||
|
}
|
||||||
|
if (endpointing && endpointDetector.accept(pcm, count)) {
|
||||||
|
emitSpeechEnd();
|
||||||
|
}
|
||||||
|
// PCM and frame metadata flow in every mode so levels, recording,
|
||||||
|
// and the Microphones radar keep working alongside onboard ASR.
|
||||||
|
emitPcm(pcm, count);
|
||||||
|
if (hasFrameMeta) {
|
||||||
|
emitFrameMeta(angleDegrees, ssr);
|
||||||
|
}
|
||||||
|
if (mode != VoiceInputMode.CLOUD) {
|
||||||
|
float[] samples = new float[count];
|
||||||
|
for (int i = 0; i < count; i++) {
|
||||||
|
samples[i] = pcm[i] / 32768.0f;
|
||||||
|
}
|
||||||
|
processRecognizer(samples);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 50 ms chunks match the G2 packet cadence the rest of the pipeline
|
||||||
|
// (endpointing, transcript pacing) is tuned for.
|
||||||
|
private static final int PHONE_MIC_CHUNK_SAMPLES = SAMPLE_RATE / 20;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the phone's own microphone at the pipeline's native format
|
||||||
|
* (16 kHz mono PCM16), or null when it cannot start — the permission is
|
||||||
|
* missing (SecurityException) or the device refuses the configuration.
|
||||||
|
*/
|
||||||
|
private android.media.AudioRecord openPhoneMic() {
|
||||||
|
android.media.AudioRecord record = null;
|
||||||
|
try {
|
||||||
|
int minBytes = android.media.AudioRecord.getMinBufferSize(
|
||||||
|
SAMPLE_RATE,
|
||||||
|
android.media.AudioFormat.CHANNEL_IN_MONO,
|
||||||
|
android.media.AudioFormat.ENCODING_PCM_16BIT);
|
||||||
|
int bufferBytes = Math.max(minBytes, PHONE_MIC_CHUNK_SAMPLES * 2 * 4);
|
||||||
|
record = new android.media.AudioRecord(
|
||||||
|
android.media.MediaRecorder.AudioSource.VOICE_RECOGNITION,
|
||||||
|
SAMPLE_RATE,
|
||||||
|
android.media.AudioFormat.CHANNEL_IN_MONO,
|
||||||
|
android.media.AudioFormat.ENCODING_PCM_16BIT,
|
||||||
|
bufferBytes);
|
||||||
|
if (record.getState() != android.media.AudioRecord.STATE_INITIALIZED) {
|
||||||
|
record.release();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
record.startRecording();
|
||||||
|
if (record.getRecordingState() != android.media.AudioRecord.RECORDSTATE_RECORDING) {
|
||||||
|
record.release();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return record;
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "phone mic open failed", t);
|
||||||
|
if (record != null) {
|
||||||
|
record.release();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phone-mic capture loop: no LC3 decode, no arm bookkeeping, no frame
|
||||||
|
* metadata — AudioRecord already delivers the pipeline's PCM format. The
|
||||||
|
* blocking read returns every chunk (50 ms), which bounds how long a
|
||||||
|
* stop() waits for the loop to notice `started` dropped.
|
||||||
|
*/
|
||||||
|
private void processPhoneAudio(android.media.AudioRecord record) {
|
||||||
|
short[] pcm = new short[PHONE_MIC_CHUNK_SAMPLES];
|
||||||
|
while (started && !Thread.currentThread().isInterrupted()) {
|
||||||
|
int read = record.read(pcm, 0, pcm.length);
|
||||||
|
if (read < 0) {
|
||||||
|
Log.w(TAG, "phone mic read failed: " + read);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (read == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
decodedSamples += read;
|
||||||
|
processPcmChunk(pcm, read, 0, 0, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void processRecognizer(float[] samples) {
|
private void processRecognizer(float[] samples) {
|
||||||
appendTranscriptSamples(samples);
|
appendTranscriptSamples(samples);
|
||||||
long now = SystemClock.elapsedRealtime();
|
long now = SystemClock.elapsedRealtime();
|
||||||
@@ -582,6 +845,83 @@ public class FaceclawVoiceController {
|
|||||||
mainHandler.post(() -> currentListener.onPcm(le));
|
mainHandler.post(() -> currentListener.onPcm(le));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Embed the session's buffered utterance and compare it to the enrolled
|
||||||
|
* wearer voice-print. Fails open: a session too short to verify, or a
|
||||||
|
* model that will not load, counts as the wearer rather than silencing
|
||||||
|
* every command.
|
||||||
|
*/
|
||||||
|
private void runSpeakerVerification() {
|
||||||
|
short[] buffer = verifyBuffer;
|
||||||
|
float[] wearer = verifyWearerEmbedding;
|
||||||
|
String modelPath = verifySpeakerModelPath;
|
||||||
|
verifyBuffer = null;
|
||||||
|
if (buffer == null || wearer == null || modelPath == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (verifyCount < VERIFY_MIN_SAMPLES) {
|
||||||
|
emitSpeakerVerified(true, 0f);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
FaceclawSpeakerId speakerId = cachedSpeakerId(modelPath);
|
||||||
|
try {
|
||||||
|
byte[] le = new byte[verifyCount * 2];
|
||||||
|
for (int i = 0; i < verifyCount; i++) {
|
||||||
|
short s = buffer[i];
|
||||||
|
le[i * 2] = (byte) (s & 0xff);
|
||||||
|
le[i * 2 + 1] = (byte) ((s >> 8) & 0xff);
|
||||||
|
}
|
||||||
|
float[] embedding = speakerId.embed(le, SAMPLE_RATE);
|
||||||
|
if (embedding == null || embedding.length != wearer.length) {
|
||||||
|
emitSpeakerVerified(true, 0f);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
double dot = 0;
|
||||||
|
for (int i = 0; i < embedding.length; i++) {
|
||||||
|
dot += (double) embedding[i] * wearer[i];
|
||||||
|
}
|
||||||
|
boolean isWearer = dot >= verifyThreshold;
|
||||||
|
Log.i(TAG, "speaker verification similarity=" + String.format(java.util.Locale.US, "%.3f", dot)
|
||||||
|
+ " threshold=" + verifyThreshold + " isWearer=" + isWearer);
|
||||||
|
emitSpeakerVerified(isWearer, (float) dot);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
Log.w(TAG, "speaker verification failed", t);
|
||||||
|
emitSpeakerVerified(true, 0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The 28 MB embedding model takes seconds to load; keep one instance
|
||||||
|
// across capture sessions so verification adds only the embed time.
|
||||||
|
private static FaceclawSpeakerId sharedSpeakerId;
|
||||||
|
private static String sharedSpeakerIdPath;
|
||||||
|
|
||||||
|
private static synchronized FaceclawSpeakerId cachedSpeakerId(String modelPath) {
|
||||||
|
if (sharedSpeakerId == null || !modelPath.equals(sharedSpeakerIdPath)) {
|
||||||
|
if (sharedSpeakerId != null) {
|
||||||
|
sharedSpeakerId.close();
|
||||||
|
}
|
||||||
|
sharedSpeakerId = new FaceclawSpeakerId(modelPath);
|
||||||
|
sharedSpeakerIdPath = modelPath;
|
||||||
|
}
|
||||||
|
return sharedSpeakerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitSpeakerVerified(boolean isWearer, float similarity) {
|
||||||
|
FaceclawVoiceControllerListener currentListener = listener;
|
||||||
|
if (currentListener == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
mainHandler.post(() -> currentListener.onSpeakerVerified(isWearer, similarity));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void emitFrameMeta(int angleDegrees, int ssr) {
|
||||||
|
FaceclawVoiceControllerListener currentListener = listener;
|
||||||
|
if (currentListener == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
mainHandler.post(() -> currentListener.onFrameMeta(angleDegrees, ssr));
|
||||||
|
}
|
||||||
|
|
||||||
private void emitSpeechEnd() {
|
private void emitSpeechEnd() {
|
||||||
FaceclawVoiceControllerListener currentListener = listener;
|
FaceclawVoiceControllerListener currentListener = listener;
|
||||||
if (currentListener == null) {
|
if (currentListener == null) {
|
||||||
|
|||||||
+21
-2
@@ -11,15 +11,34 @@ public interface FaceclawVoiceControllerListener {
|
|||||||
void onTranscript(String text, boolean isFinal);
|
void onTranscript(String text, boolean isFinal);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decoded microphone audio for CLOUD mode: 16 kHz mono signed 16-bit
|
* Decoded microphone audio: 16 kHz mono signed 16-bit little-endian PCM.
|
||||||
* little-endian PCM. Empty/absent in onboard mode.
|
* Emitted in every mode so raw-PCM consumers (levels, recording, captions)
|
||||||
|
* keep working while the onboard recognizer owns the transcript.
|
||||||
*/
|
*/
|
||||||
void onPcm(byte[] pcm16le);
|
void onPcm(byte[] pcm16le);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Per-packet DSP metadata the glasses firmware appends to each 50 ms audio
|
||||||
|
* packet, computed on the raw stereo capture before its mono downmix: the
|
||||||
|
* direction-of-arrival in signed degrees (0 = straight ahead, positive to
|
||||||
|
* the wearer's right) and a signal-strength ratio that serves as a
|
||||||
|
* confidence/energy proxy for the angle.
|
||||||
|
*/
|
||||||
|
void onFrameMeta(int angleDegrees, int ssr);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The speaker stopped, in a hands-free session that has no button release
|
* The speaker stopped, in a hands-free session that has no button release
|
||||||
* to end it. Only fires when endpointing was enabled for the session; see
|
* to end it. Only fires when endpointing was enabled for the session; see
|
||||||
* FaceclawVoiceController.setEndpointing.
|
* FaceclawVoiceController.setEndpointing.
|
||||||
*/
|
*/
|
||||||
void onSpeechEnd();
|
void onSpeechEnd();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Result of speaker verification against the enrolled wearer voice-print,
|
||||||
|
* emitted once per capture session just before the final transcript.
|
||||||
|
* Only fires when verification was configured for the session; fails
|
||||||
|
* open (isWearer=true) when the utterance was too short to verify or the
|
||||||
|
* speaker model could not be loaded.
|
||||||
|
*/
|
||||||
|
void onSpeakerVerified(boolean isWearer, float similarity);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.RandomAccessFile;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
import java.nio.ByteOrder;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Streaming WAV writer for conversation recordings: the header is written up
|
||||||
|
* front with zero sizes and patched on finish, so a crash mid-session leaves
|
||||||
|
* a recoverable file (data length can be derived from the file size).
|
||||||
|
*/
|
||||||
|
public class FaceclawWavRecorder {
|
||||||
|
private static final String TAG = "FaceclawWavRecorder";
|
||||||
|
|
||||||
|
private final String path;
|
||||||
|
private final int sampleRate;
|
||||||
|
private final int channels;
|
||||||
|
private RandomAccessFile file;
|
||||||
|
private long dataBytes;
|
||||||
|
|
||||||
|
public FaceclawWavRecorder(String path, int sampleRate, int channels) throws IOException {
|
||||||
|
this.path = path;
|
||||||
|
this.sampleRate = sampleRate;
|
||||||
|
this.channels = channels;
|
||||||
|
File parent = new File(path).getParentFile();
|
||||||
|
if (parent != null && !parent.exists() && !parent.mkdirs()) {
|
||||||
|
throw new IOException("could not create " + parent);
|
||||||
|
}
|
||||||
|
file = new RandomAccessFile(path, "rw");
|
||||||
|
file.setLength(0);
|
||||||
|
file.write(buildHeader(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized void append(byte[] pcm16le) {
|
||||||
|
if (file == null || pcm16le == null || pcm16le.length == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
file.write(pcm16le);
|
||||||
|
dataBytes += pcm16le.length;
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.w(TAG, "append failed", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized long getDurationMs() {
|
||||||
|
return dataBytes * 1000L / (sampleRate * channels * 2L);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPath() {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Patch the header and close. Returns the PCM byte count (0 = empty). */
|
||||||
|
public synchronized long finish() {
|
||||||
|
RandomAccessFile current = file;
|
||||||
|
file = null;
|
||||||
|
if (current == null) {
|
||||||
|
return dataBytes;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
current.seek(0);
|
||||||
|
current.write(buildHeader((int) Math.min(dataBytes, Integer.MAX_VALUE)));
|
||||||
|
current.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
Log.w(TAG, "finish failed", e);
|
||||||
|
}
|
||||||
|
return dataBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Delete the (finished or abandoned) recording. */
|
||||||
|
public synchronized void discard() {
|
||||||
|
finish();
|
||||||
|
new File(path).delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] buildHeader(int pcmBytes) {
|
||||||
|
int byteRate = sampleRate * channels * 2;
|
||||||
|
ByteBuffer b = ByteBuffer.allocate(44).order(ByteOrder.LITTLE_ENDIAN);
|
||||||
|
b.put("RIFF".getBytes(StandardCharsets.US_ASCII));
|
||||||
|
b.putInt(36 + pcmBytes);
|
||||||
|
b.put("WAVE".getBytes(StandardCharsets.US_ASCII));
|
||||||
|
b.put("fmt ".getBytes(StandardCharsets.US_ASCII));
|
||||||
|
b.putInt(16);
|
||||||
|
b.putShort((short) 1);
|
||||||
|
b.putShort((short) channels);
|
||||||
|
b.putInt(sampleRate);
|
||||||
|
b.putInt(byteRate);
|
||||||
|
b.putShort((short) (channels * 2));
|
||||||
|
b.putShort((short) 16);
|
||||||
|
b.put("data".getBytes(StandardCharsets.US_ASCII));
|
||||||
|
b.putInt(pcmBytes);
|
||||||
|
return b.array();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,383 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.google.android.gms.common.ConnectionResult;
|
||||||
|
import com.google.android.gms.common.GoogleApiAvailability;
|
||||||
|
import com.google.android.gms.wearable.CapabilityClient;
|
||||||
|
import com.google.android.gms.wearable.CapabilityInfo;
|
||||||
|
import com.google.android.gms.wearable.DataMap;
|
||||||
|
import com.google.android.gms.wearable.MessageEvent;
|
||||||
|
import com.google.android.gms.wearable.Node;
|
||||||
|
import com.google.android.gms.wearable.PutDataMapRequest;
|
||||||
|
import com.google.android.gms.wearable.PutDataRequest;
|
||||||
|
import com.google.android.gms.wearable.Wearable;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayDeque;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phone side of the Wear OS integration: the single place that talks to the
|
||||||
|
* Wearable Data Layer (Google Play services), so the JS side only ever sees
|
||||||
|
* JSON strings and never touches Play services types.
|
||||||
|
*
|
||||||
|
* Inbound: FaceclawWearListenerService hands every watch message to
|
||||||
|
* {@link #handleMessage}; it is forwarded to the JS listener on the thread
|
||||||
|
* that registered it (the main isolate), mirroring FaceclawSettings. Messages
|
||||||
|
* that arrive before a listener exists (the watch poked a phone whose JS
|
||||||
|
* dashboard is not up yet) are acked with jsReady=false so the watch can say
|
||||||
|
* "open Faceclaw on your phone"; only idempotent state requests are kept for
|
||||||
|
* replay on registration — the watch already reported gestures and commands
|
||||||
|
* as failed, and executing them tens of seconds later would act on whatever
|
||||||
|
* the glasses happen to show by then.
|
||||||
|
*
|
||||||
|
* Outbound: {@link #publishState} mirrors the dashboard state into a Data
|
||||||
|
* Layer item (delivered even if the watch is out of range right now, and
|
||||||
|
* available to the watch app the moment it opens), while {@link #sendToWatch}
|
||||||
|
* sends fire-and-forget messages (acks, assistant text) to every reachable
|
||||||
|
* watch that advertises the Faceclaw watch-app capability.
|
||||||
|
*
|
||||||
|
* Everything is a no-op on phones without Google Play services.
|
||||||
|
*/
|
||||||
|
public final class FaceclawWearBridge {
|
||||||
|
private static final String TAG = "FaceclawWear";
|
||||||
|
|
||||||
|
/** Advertised by the watch app (wear/app/src/main/res/values/wear.xml). */
|
||||||
|
public static final String CAPABILITY_WATCH = "faceclaw_watch";
|
||||||
|
/** Advertised by this app (res/values/wear.xml) so the watch can find the phone. */
|
||||||
|
public static final String CAPABILITY_PHONE = "faceclaw_phone";
|
||||||
|
|
||||||
|
public static final String PATH_PREFIX = "/faceclaw";
|
||||||
|
public static final String PATH_STATE = "/faceclaw/state";
|
||||||
|
public static final String PATH_STATE_REQUEST = "/faceclaw/state/request";
|
||||||
|
public static final String PATH_ACK = "/faceclaw/ack";
|
||||||
|
public static final String PATH_EVENT = "/faceclaw/event";
|
||||||
|
|
||||||
|
private static final String STATE_KEY_JSON = "json";
|
||||||
|
private static final String STATE_KEY_UPDATED_AT = "updatedAt";
|
||||||
|
|
||||||
|
/** Messages kept for a listener that is not registered yet. */
|
||||||
|
private static final int PENDING_LIMIT = 16;
|
||||||
|
private static final long PENDING_MAX_AGE_MS = 30_000;
|
||||||
|
|
||||||
|
private static volatile FaceclawWearBridge instance;
|
||||||
|
|
||||||
|
private final Context context;
|
||||||
|
private final boolean available;
|
||||||
|
private final Object lock = new Object();
|
||||||
|
private FaceclawWearListener listener;
|
||||||
|
private Handler listenerHandler;
|
||||||
|
private final ArrayDeque<PendingMessage> pending = new ArrayDeque<>();
|
||||||
|
private final List<Node> watchNodes = new ArrayList<>();
|
||||||
|
private String lastPublishedState = null;
|
||||||
|
|
||||||
|
private static final class PendingMessage {
|
||||||
|
final String path;
|
||||||
|
final String json;
|
||||||
|
final String nodeId;
|
||||||
|
final long receivedAt;
|
||||||
|
|
||||||
|
PendingMessage(String path, String json, String nodeId, long receivedAt) {
|
||||||
|
this.path = path;
|
||||||
|
this.json = json;
|
||||||
|
this.nodeId = nodeId;
|
||||||
|
this.receivedAt = receivedAt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private FaceclawWearBridge(Context context) {
|
||||||
|
this.context = context.getApplicationContext();
|
||||||
|
boolean playServices;
|
||||||
|
try {
|
||||||
|
playServices = GoogleApiAvailability.getInstance()
|
||||||
|
.isGooglePlayServicesAvailable(this.context) == ConnectionResult.SUCCESS;
|
||||||
|
} catch (Throwable error) {
|
||||||
|
Log.w(TAG, "Play services availability check failed", error);
|
||||||
|
playServices = false;
|
||||||
|
}
|
||||||
|
this.available = playServices;
|
||||||
|
if (!available) {
|
||||||
|
Log.i(TAG, "Google Play services unavailable; watch integration disabled");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Initialize (idempotent) and return the singleton. */
|
||||||
|
public static FaceclawWearBridge getInstance(Context context) {
|
||||||
|
if (instance == null) {
|
||||||
|
synchronized (FaceclawWearBridge.class) {
|
||||||
|
if (instance == null) {
|
||||||
|
instance = new FaceclawWearBridge(context);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether the Wearable Data Layer can be used on this phone at all. */
|
||||||
|
public boolean isAvailable() {
|
||||||
|
return available;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register the JS listener. Must be called from the thread whose isolate
|
||||||
|
* owns it; that thread's Looper is captured for dispatch. Replays any
|
||||||
|
* recently queued watch messages and refreshes the reachable-watch set.
|
||||||
|
*/
|
||||||
|
public void setListener(FaceclawWearListener newListener) {
|
||||||
|
Looper looper = Looper.myLooper();
|
||||||
|
if (looper == null) {
|
||||||
|
Log.w(TAG, "wear listener registered from a Looper-less thread; it will never be notified");
|
||||||
|
}
|
||||||
|
List<PendingMessage> replay;
|
||||||
|
synchronized (lock) {
|
||||||
|
listener = newListener;
|
||||||
|
listenerHandler = looper != null ? new Handler(looper) : null;
|
||||||
|
replay = new ArrayList<>(pending);
|
||||||
|
pending.clear();
|
||||||
|
}
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
for (PendingMessage message : replay) {
|
||||||
|
if (now - message.receivedAt <= PENDING_MAX_AGE_MS) {
|
||||||
|
dispatchMessage(message.path, message.json, message.nodeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
refreshWatchNodes();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clearListener() {
|
||||||
|
synchronized (lock) {
|
||||||
|
listener = null;
|
||||||
|
listenerHandler = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isWatchReachable() {
|
||||||
|
synchronized (lock) {
|
||||||
|
return !watchNodes.isEmpty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Display name of a reachable watch ("" if none). */
|
||||||
|
public String getWatchName() {
|
||||||
|
synchronized (lock) {
|
||||||
|
return watchNodes.isEmpty() ? "" : watchNodes.get(0).getDisplayName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Re-query which watches advertise the Faceclaw watch-app capability. */
|
||||||
|
public void refreshWatchNodes() {
|
||||||
|
if (!available) return;
|
||||||
|
try {
|
||||||
|
Wearable.getCapabilityClient(context)
|
||||||
|
.getCapability(CAPABILITY_WATCH, CapabilityClient.FILTER_REACHABLE)
|
||||||
|
.addOnSuccessListener(this::updateWatchNodes)
|
||||||
|
.addOnFailureListener(error -> Log.w(TAG, "capability query failed", error));
|
||||||
|
} catch (Throwable error) {
|
||||||
|
Log.w(TAG, "capability query failed", error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mirror the dashboard state to the watch. Identical consecutive states
|
||||||
|
* are not re-sent (the Data Layer would drop them anyway).
|
||||||
|
*/
|
||||||
|
public void publishState(String json) {
|
||||||
|
publishState(json, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** As {@link #publishState(String)}; `force` re-sends an unchanged state. */
|
||||||
|
public void publishState(String json, boolean force) {
|
||||||
|
if (!available || json == null) return;
|
||||||
|
synchronized (lock) {
|
||||||
|
if (!force && json.equals(lastPublishedState)) return;
|
||||||
|
lastPublishedState = json;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
PutDataMapRequest request = PutDataMapRequest.create(PATH_STATE);
|
||||||
|
DataMap map = request.getDataMap();
|
||||||
|
map.putString(STATE_KEY_JSON, json);
|
||||||
|
map.putLong(STATE_KEY_UPDATED_AT, System.currentTimeMillis());
|
||||||
|
PutDataRequest put = request.asPutDataRequest().setUrgent();
|
||||||
|
Wearable.getDataClient(context)
|
||||||
|
.putDataItem(put)
|
||||||
|
.addOnFailureListener(error -> Log.w(TAG, "state publish failed", error));
|
||||||
|
} catch (Throwable error) {
|
||||||
|
Log.w(TAG, "state publish failed", error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Send a message to every reachable watch running the Faceclaw watch app. */
|
||||||
|
public void sendToWatch(String path, String json) {
|
||||||
|
if (!available) return;
|
||||||
|
List<Node> targets;
|
||||||
|
synchronized (lock) {
|
||||||
|
targets = new ArrayList<>(watchNodes);
|
||||||
|
}
|
||||||
|
if (targets.isEmpty()) {
|
||||||
|
// Nothing known yet (first message after boot): look the watch up, then send.
|
||||||
|
try {
|
||||||
|
Wearable.getCapabilityClient(context)
|
||||||
|
.getCapability(CAPABILITY_WATCH, CapabilityClient.FILTER_REACHABLE)
|
||||||
|
.addOnSuccessListener(info -> {
|
||||||
|
updateWatchNodes(info);
|
||||||
|
for (Node node : info.getNodes()) {
|
||||||
|
sendToNode(node.getId(), path, json);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.addOnFailureListener(error -> Log.w(TAG, "capability query failed", error));
|
||||||
|
} catch (Throwable error) {
|
||||||
|
Log.w(TAG, "capability query failed", error);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (Node node : targets) {
|
||||||
|
sendToNode(node.getId(), path, json);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Send a message to one specific node (e.g. an ack back to the sender). */
|
||||||
|
public void sendToNode(String nodeId, String path, String json) {
|
||||||
|
if (!available || nodeId == null || nodeId.isEmpty()) return;
|
||||||
|
try {
|
||||||
|
byte[] payload = (json != null ? json : "{}").getBytes(StandardCharsets.UTF_8);
|
||||||
|
Wearable.getMessageClient(context)
|
||||||
|
.sendMessage(nodeId, path, payload)
|
||||||
|
.addOnFailureListener(error -> Log.w(TAG, "send " + path + " to " + nodeId + " failed", error));
|
||||||
|
} catch (Throwable error) {
|
||||||
|
Log.w(TAG, "send " + path + " failed", error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Reply to a watch message; `seq` echoes the watch's sequence number. */
|
||||||
|
public void sendAck(String nodeId, long seq, boolean ok, boolean jsReady, String message) {
|
||||||
|
JSONObject ack = new JSONObject();
|
||||||
|
try {
|
||||||
|
ack.put("seq", seq);
|
||||||
|
ack.put("ok", ok);
|
||||||
|
ack.put("jsReady", jsReady);
|
||||||
|
ack.put("message", message != null ? message : "");
|
||||||
|
} catch (JSONException ignored) {
|
||||||
|
// The keys are constants; this cannot happen.
|
||||||
|
}
|
||||||
|
sendToNode(nodeId, PATH_ACK, ack.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Entry point for FaceclawWearListenerService; may run on any thread. */
|
||||||
|
void handleMessage(MessageEvent event) {
|
||||||
|
if (event == null) return;
|
||||||
|
String path = event.getPath();
|
||||||
|
if (path == null || !path.startsWith(PATH_PREFIX)) return;
|
||||||
|
byte[] data = event.getData();
|
||||||
|
String json = data != null && data.length > 0 ? new String(data, StandardCharsets.UTF_8) : "{}";
|
||||||
|
String nodeId = event.getSourceNodeId();
|
||||||
|
Log.d(TAG, "recv " + path + " seq=" + readSeq(json));
|
||||||
|
|
||||||
|
boolean delivered = dispatchMessage(path, json, nodeId);
|
||||||
|
if (delivered) return;
|
||||||
|
|
||||||
|
// No JS listener yet: tell the watch so it can explain why nothing is
|
||||||
|
// happening. Only state requests are kept for replay (see class doc);
|
||||||
|
// everything else is dropped after the failure ack.
|
||||||
|
if (PATH_STATE_REQUEST.equals(path)) {
|
||||||
|
synchronized (lock) {
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
while (!pending.isEmpty() && now - pending.peekFirst().receivedAt > PENDING_MAX_AGE_MS) {
|
||||||
|
pending.pollFirst();
|
||||||
|
}
|
||||||
|
if (pending.size() >= PENDING_LIMIT) {
|
||||||
|
pending.pollFirst();
|
||||||
|
}
|
||||||
|
pending.addLast(new PendingMessage(path, json, nodeId, now));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sendAck(nodeId, readSeq(json), false, false, "Faceclaw is not running on the phone. Open it to connect the glasses.");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Entry point for FaceclawWearListenerService's capability callback. */
|
||||||
|
void handleCapabilityChanged(CapabilityInfo info) {
|
||||||
|
if (info == null || !CAPABILITY_WATCH.equals(info.getName())) return;
|
||||||
|
updateWatchNodes(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateWatchNodes(CapabilityInfo info) {
|
||||||
|
Set<Node> nodes = info != null ? info.getNodes() : Collections.<Node>emptySet();
|
||||||
|
// Every reachable watch gets messages; a nearby (Bluetooth-linked)
|
||||||
|
// one is listed first so it is the name the phone UI shows.
|
||||||
|
List<Node> reachable = new ArrayList<>();
|
||||||
|
for (Node node : nodes) {
|
||||||
|
if (node.isNearby()) reachable.add(0, node); else reachable.add(node);
|
||||||
|
}
|
||||||
|
boolean changed;
|
||||||
|
String name;
|
||||||
|
synchronized (lock) {
|
||||||
|
changed = !sameNodeIds(watchNodes, reachable);
|
||||||
|
watchNodes.clear();
|
||||||
|
watchNodes.addAll(reachable);
|
||||||
|
name = watchNodes.isEmpty() ? "" : watchNodes.get(0).getDisplayName();
|
||||||
|
}
|
||||||
|
if (changed) {
|
||||||
|
Log.i(TAG, reachable.isEmpty() ? "no Faceclaw watch reachable" : "watch reachable: " + name);
|
||||||
|
boolean reachableNow = !reachable.isEmpty();
|
||||||
|
FaceclawWearListener target;
|
||||||
|
Handler handler;
|
||||||
|
synchronized (lock) {
|
||||||
|
target = listener;
|
||||||
|
handler = listenerHandler;
|
||||||
|
}
|
||||||
|
if (target != null && handler != null) {
|
||||||
|
handler.post(() -> {
|
||||||
|
try {
|
||||||
|
target.onWatchConnection(reachableNow, name);
|
||||||
|
} catch (Exception error) {
|
||||||
|
Log.w(TAG, "watch connection listener failed", error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean sameNodeIds(List<Node> a, List<Node> b) {
|
||||||
|
if (a.size() != b.size()) return false;
|
||||||
|
for (int i = 0; i < a.size(); i++) {
|
||||||
|
if (!a.get(i).getId().equals(b.get(i).getId())) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Post to the JS listener; false when there is none to post to. */
|
||||||
|
private boolean dispatchMessage(String path, String json, String nodeId) {
|
||||||
|
FaceclawWearListener target;
|
||||||
|
Handler handler;
|
||||||
|
synchronized (lock) {
|
||||||
|
target = listener;
|
||||||
|
handler = listenerHandler;
|
||||||
|
}
|
||||||
|
if (target == null || handler == null) return false;
|
||||||
|
handler.post(() -> {
|
||||||
|
try {
|
||||||
|
target.onMessage(path, json, nodeId);
|
||||||
|
} catch (Exception error) {
|
||||||
|
Log.w(TAG, "wear message listener failed for " + path, error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long readSeq(String json) {
|
||||||
|
try {
|
||||||
|
return new JSONObject(json).optLong("seq", 0);
|
||||||
|
} catch (JSONException error) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callbacks from the Android Wear (Wear OS) bridge; implemented in JS. Every
|
||||||
|
* call is delivered on the thread that registered the listener (see
|
||||||
|
* FaceclawWearBridge.setListener).
|
||||||
|
*/
|
||||||
|
public interface FaceclawWearListener {
|
||||||
|
/**
|
||||||
|
* A message from the watch app. `path` is the Data Layer message path
|
||||||
|
* (e.g. "/faceclaw/input"); `json` is the UTF-8 payload (always a JSON
|
||||||
|
* object, "{}" when the watch sent none); `nodeId` identifies the watch
|
||||||
|
* so a reply can be addressed to it.
|
||||||
|
*/
|
||||||
|
void onMessage(String path, String json, String nodeId);
|
||||||
|
|
||||||
|
/** The set of reachable watches running the Faceclaw watch app changed. */
|
||||||
|
void onWatchConnection(boolean reachable, String watchName);
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package com.faceclaw.app;
|
||||||
|
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.google.android.gms.wearable.CapabilityInfo;
|
||||||
|
import com.google.android.gms.wearable.MessageEvent;
|
||||||
|
import com.google.android.gms.wearable.WearableListenerService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Play services starts this service (in the app process) for every Data
|
||||||
|
* Layer message under /faceclaw and for capability changes, whether or not
|
||||||
|
* the app is running. It only forwards to FaceclawWearBridge, which owns the
|
||||||
|
* hand-off to the JS side.
|
||||||
|
*/
|
||||||
|
public class FaceclawWearListenerService extends WearableListenerService {
|
||||||
|
@Override
|
||||||
|
public void onMessageReceived(MessageEvent event) {
|
||||||
|
Log.d("FaceclawWear", "service onMessageReceived " + event.getPath() + " from " + event.getSourceNodeId());
|
||||||
|
FaceclawWearBridge.getInstance(this).handleMessage(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCapabilityChanged(CapabilityInfo info) {
|
||||||
|
FaceclawWearBridge.getInstance(this).handleCapabilityChanged(info);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,13 +15,18 @@ public final class PreviewBitmapUtil {
|
|||||||
private PreviewBitmapUtil() {}
|
private PreviewBitmapUtil() {}
|
||||||
|
|
||||||
public static Bitmap fromGray(ByteBuffer gray, int width, int height, double brightenGamma) {
|
public static Bitmap fromGray(ByteBuffer gray, int width, int height, double brightenGamma) {
|
||||||
|
return fromGray(gray, width, height, brightenGamma, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** As above; `green` renders green-on-black (matching the physical glasses) instead of grayscale. */
|
||||||
|
public static Bitmap fromGray(ByteBuffer gray, int width, int height, double brightenGamma, boolean green) {
|
||||||
if (gray == null || width <= 0 || height <= 0 || gray.remaining() < width * height) {
|
if (gray == null || width <= 0 || height <= 0 || gray.remaining() < width * height) {
|
||||||
throw new IllegalArgumentException("invalid gray preview buffer");
|
throw new IllegalArgumentException("invalid gray preview buffer");
|
||||||
}
|
}
|
||||||
int[] lut = new int[256];
|
int[] lut = new int[256];
|
||||||
for (int g = 0; g < 256; g++) {
|
for (int g = 0; g < 256; g++) {
|
||||||
int v = (int) Math.max(0, Math.min(255, Math.round(255 * Math.pow(g / 255.0, brightenGamma))));
|
int v = (int) Math.max(0, Math.min(255, Math.round(255 * Math.pow(g / 255.0, brightenGamma))));
|
||||||
lut[g] = 0xff000000 | (v << 16) | (v << 8) | v;
|
lut[g] = green ? (0xff000000 | (v << 8)) : (0xff000000 | (v << 16) | (v << 8) | v);
|
||||||
}
|
}
|
||||||
byte[] bytes = new byte[width * height];
|
byte[] bytes = new byte[width * height];
|
||||||
gray.get(bytes);
|
gray.get(bytes);
|
||||||
|
|||||||
@@ -49,6 +49,14 @@ public class BleProtocol {
|
|||||||
// protobuf fields to stock implementations, so they are safely ignored.
|
// protobuf fields to stock implementations, so they are safely ignored.
|
||||||
public static final int FACECLAW_WAKE_CONTROL_FIELD = 101;
|
public static final int FACECLAW_WAKE_CONTROL_FIELD = 101;
|
||||||
public static final int FACECLAW_WAKE_EVENT_FIELD = 102;
|
public static final int FACECLAW_WAKE_EVENT_FIELD = 102;
|
||||||
|
/**
|
||||||
|
* CFW mic_control (EVENCFW/16, caps tokens micctl/micmc/micraw): host
|
||||||
|
* writes an ['M','C',ver,op,...] record as settings field 103; each temple
|
||||||
|
* reports a 21-byte ['M','C',ver,...] status as field 104, both appended
|
||||||
|
* to settings read responses and as standalone commandId=3 pushes.
|
||||||
|
*/
|
||||||
|
public static final int FACECLAW_MIC_CONTROL_FIELD = 103;
|
||||||
|
public static final int FACECLAW_MIC_STATUS_FIELD = 104;
|
||||||
public static final int FACECLAW_WAKE_OP_ACQUIRE = 1;
|
public static final int FACECLAW_WAKE_OP_ACQUIRE = 1;
|
||||||
public static final int FACECLAW_WAKE_OP_RELEASE = 2;
|
public static final int FACECLAW_WAKE_OP_RELEASE = 2;
|
||||||
public static final int FACECLAW_WAKE_OP_CLAIM = 3;
|
public static final int FACECLAW_WAKE_OP_CLAIM = 3;
|
||||||
@@ -405,6 +413,40 @@ public class BleProtocol {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrap an already-encoded ['M','C',ver,op,...] mic-control record as a
|
||||||
|
* settings write carrying CFW field 103. Magic zero makes it
|
||||||
|
* fire-and-forget like the wake lease: the firmware consumes the field
|
||||||
|
* before its stock nanopb decoder discards the unknown tag, and the
|
||||||
|
* "ack" is the field-104 status notify that follows.
|
||||||
|
*/
|
||||||
|
public static byte[] buildFaceclawMicControl(byte[] record) {
|
||||||
|
return concat(CollectionUtils.listOf(
|
||||||
|
encodeVarintField(1, 1),
|
||||||
|
encodeVarintField(2, 0),
|
||||||
|
encodeBytesField(FACECLAW_MIC_CONTROL_FIELD, record)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract the CFW mic status record (field 104) from a settings frame, or
|
||||||
|
* null when absent. The 21-byte body layout is decoded on the TS side;
|
||||||
|
* here we only validate the 'M','C',version prelude.
|
||||||
|
*/
|
||||||
|
public static byte[] parseFaceclawMicStatus(byte[] pb) {
|
||||||
|
if (pb == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
byte[] body = readFieldBytes(stripTrailingCrc(pb), FACECLAW_MIC_STATUS_FIELD);
|
||||||
|
if (body == null
|
||||||
|
|| body.length < 3
|
||||||
|
|| body[0] != 'M'
|
||||||
|
|| body[1] != 'C') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the uint16 wake nonce from a CFW field-102 notification, or -1
|
* Return the uint16 wake nonce from a CFW field-102 notification, or -1
|
||||||
* when this is an ordinary settings frame.
|
* when this is an ordinary settings frame.
|
||||||
|
|||||||
@@ -267,6 +267,21 @@ public class MessageBuilder {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** CFW mic_control write (settings field 103) targeted at one temple. */
|
||||||
|
public OutboundMessage faceclawMicControl(byte[] record, String label, boolean leftArm) {
|
||||||
|
return new OutboundMessage(
|
||||||
|
"mic-control",
|
||||||
|
"mic control " + label + (leftArm ? " L" : " R"),
|
||||||
|
BleProtocol.SID_UI_SETTING,
|
||||||
|
BleProtocol.FLAG_REQUEST,
|
||||||
|
0,
|
||||||
|
BleProtocol.buildFaceclawMicControl(record),
|
||||||
|
ACK_TIMEOUT_MS,
|
||||||
|
-1,
|
||||||
|
leftArm
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public OutboundMessage faceclawWearQuery(boolean leftArm) {
|
public OutboundMessage faceclawWearQuery(boolean leftArm) {
|
||||||
return new OutboundMessage(
|
return new OutboundMessage(
|
||||||
"wear-query-control",
|
"wear-query-control",
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class FastClusteringConfig {
|
||||||
|
private final int numClusters;
|
||||||
|
private final float threshold;
|
||||||
|
|
||||||
|
private FastClusteringConfig(Builder builder) {
|
||||||
|
this.numClusters = builder.numClusters;
|
||||||
|
this.threshold = builder.threshold;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNumClusters() {
|
||||||
|
return numClusters;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getThreshold() {
|
||||||
|
return threshold;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private int numClusters = -1;
|
||||||
|
private float threshold = 0.5f;
|
||||||
|
|
||||||
|
public FastClusteringConfig build() {
|
||||||
|
return new FastClusteringConfig(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setNumClusters(int numClusters) {
|
||||||
|
this.numClusters = numClusters;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setThreshold(float threshold) {
|
||||||
|
this.threshold = threshold;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+62
@@ -0,0 +1,62 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class OfflineSpeakerDiarization {
|
||||||
|
private long ptr = 0;
|
||||||
|
|
||||||
|
public OfflineSpeakerDiarization(OfflineSpeakerDiarizationConfig config) {
|
||||||
|
System.loadLibrary("onnxruntime");
|
||||||
|
System.loadLibrary("sherpa-onnx-jni");
|
||||||
|
ptr = newFromFile(config);
|
||||||
|
if (ptr == 0) {
|
||||||
|
throw new IllegalArgumentException("Invalid OfflineSpeakerDiarizationConfig: failed to create native OfflineSpeakerDiarization");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSampleRate() {
|
||||||
|
return getSampleRate(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only config.clustering is used. All other fields are ignored
|
||||||
|
public void setConfig(OfflineSpeakerDiarizationConfig config) {
|
||||||
|
setConfig(ptr, config);
|
||||||
|
}
|
||||||
|
|
||||||
|
public OfflineSpeakerDiarizationSegment[] process(float[] samples) {
|
||||||
|
return process(ptr, samples);
|
||||||
|
}
|
||||||
|
|
||||||
|
public OfflineSpeakerDiarizationSegment[] processWithCallback(float[] samples, OfflineSpeakerDiarizationCallback callback) {
|
||||||
|
return processWithCallback(ptr, samples, callback, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public OfflineSpeakerDiarizationSegment[] processWithCallback(float[] samples, OfflineSpeakerDiarizationCallback callback, long arg) {
|
||||||
|
return processWithCallback(ptr, samples, callback, arg);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void finalize() throws Throwable {
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
|
||||||
|
// You'd better call it manually if it is not used anymore
|
||||||
|
public void release() {
|
||||||
|
if (this.ptr == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
delete(this.ptr);
|
||||||
|
this.ptr = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private native int getSampleRate(long ptr);
|
||||||
|
|
||||||
|
private native void delete(long ptr);
|
||||||
|
|
||||||
|
private native long newFromFile(OfflineSpeakerDiarizationConfig config);
|
||||||
|
|
||||||
|
private native void setConfig(long ptr, OfflineSpeakerDiarizationConfig config);
|
||||||
|
|
||||||
|
private native OfflineSpeakerDiarizationSegment[] process(long ptr, float[] samples);
|
||||||
|
|
||||||
|
private native OfflineSpeakerDiarizationSegment[] processWithCallback(long ptr, float[] samples, OfflineSpeakerDiarizationCallback callback, long arg);
|
||||||
|
}
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface OfflineSpeakerDiarizationCallback {
|
||||||
|
Integer invoke(int numProcessedChunks, int numTotalCunks, long arg);
|
||||||
|
}
|
||||||
+79
@@ -0,0 +1,79 @@
|
|||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class OfflineSpeakerDiarizationConfig {
|
||||||
|
private final OfflineSpeakerSegmentationModelConfig segmentation;
|
||||||
|
private final SpeakerEmbeddingExtractorConfig embedding;
|
||||||
|
private final FastClusteringConfig clustering;
|
||||||
|
private final float minDurationOn;
|
||||||
|
private final float minDurationOff;
|
||||||
|
|
||||||
|
private OfflineSpeakerDiarizationConfig(Builder builder) {
|
||||||
|
this.segmentation = builder.segmentation;
|
||||||
|
this.embedding = builder.embedding;
|
||||||
|
this.clustering = builder.clustering;
|
||||||
|
this.minDurationOff = builder.minDurationOff;
|
||||||
|
this.minDurationOn = builder.minDurationOn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
public OfflineSpeakerSegmentationModelConfig getSegmentation() {
|
||||||
|
return segmentation;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SpeakerEmbeddingExtractorConfig getEmbedding() {
|
||||||
|
return embedding;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FastClusteringConfig getClustering() {
|
||||||
|
return clustering;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getMinDurationOff() {
|
||||||
|
return minDurationOff;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getMinDurationOn() {
|
||||||
|
return minDurationOn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private OfflineSpeakerSegmentationModelConfig segmentation = OfflineSpeakerSegmentationModelConfig.builder().build();
|
||||||
|
private SpeakerEmbeddingExtractorConfig embedding = SpeakerEmbeddingExtractorConfig.builder().build();
|
||||||
|
private FastClusteringConfig clustering = FastClusteringConfig.builder().build();
|
||||||
|
private float minDurationOn = 0.2f;
|
||||||
|
private float minDurationOff = 0.5f;
|
||||||
|
|
||||||
|
public OfflineSpeakerDiarizationConfig build() {
|
||||||
|
return new OfflineSpeakerDiarizationConfig(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setSegmentation(OfflineSpeakerSegmentationModelConfig segmentation) {
|
||||||
|
this.segmentation = segmentation;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setEmbedding(SpeakerEmbeddingExtractorConfig embedding) {
|
||||||
|
this.embedding = embedding;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setClustering(FastClusteringConfig clustering) {
|
||||||
|
this.clustering = clustering;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setMinDurationOff(float minDurationOff) {
|
||||||
|
this.minDurationOff = minDurationOff;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setMinDurationOn(float minDurationOn) {
|
||||||
|
this.minDurationOn = minDurationOn;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+27
@@ -0,0 +1,27 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class OfflineSpeakerDiarizationSegment {
|
||||||
|
private final float start;
|
||||||
|
private final float end;
|
||||||
|
private final int speaker;
|
||||||
|
|
||||||
|
public OfflineSpeakerDiarizationSegment(float start, float end, int speaker) {
|
||||||
|
this.start = start;
|
||||||
|
this.end = end;
|
||||||
|
this.speaker = speaker;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getStart() {
|
||||||
|
return start;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getEnd() {
|
||||||
|
return end;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSpeaker() {
|
||||||
|
return speaker;
|
||||||
|
}
|
||||||
|
}
|
||||||
+52
@@ -0,0 +1,52 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class OfflineSpeakerSegmentationModelConfig {
|
||||||
|
private final OfflineSpeakerSegmentationPyannoteModelConfig pyannote;
|
||||||
|
private final int numThreads;
|
||||||
|
private final boolean debug;
|
||||||
|
private final String provider;
|
||||||
|
|
||||||
|
private OfflineSpeakerSegmentationModelConfig(Builder builder) {
|
||||||
|
this.pyannote = builder.pyannote;
|
||||||
|
this.numThreads = builder.numThreads;
|
||||||
|
this.debug = builder.debug;
|
||||||
|
this.provider = builder.provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private OfflineSpeakerSegmentationPyannoteModelConfig pyannote = OfflineSpeakerSegmentationPyannoteModelConfig.builder().build();
|
||||||
|
private int numThreads = 1;
|
||||||
|
private boolean debug = true;
|
||||||
|
private String provider = "cpu";
|
||||||
|
|
||||||
|
public OfflineSpeakerSegmentationModelConfig build() {
|
||||||
|
return new OfflineSpeakerSegmentationModelConfig(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setPyannote(OfflineSpeakerSegmentationPyannoteModelConfig pyannote) {
|
||||||
|
this.pyannote = pyannote;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setNumThreads(int numThreads) {
|
||||||
|
this.numThreads = numThreads;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setDebug(boolean debug) {
|
||||||
|
this.debug = debug;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setProvider(String provider) {
|
||||||
|
this.provider = provider;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+32
@@ -0,0 +1,32 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class OfflineSpeakerSegmentationPyannoteModelConfig {
|
||||||
|
private final String model;
|
||||||
|
|
||||||
|
private OfflineSpeakerSegmentationPyannoteModelConfig(Builder builder) {
|
||||||
|
this.model = builder.model;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getModel() {
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private String model = "";
|
||||||
|
|
||||||
|
public OfflineSpeakerSegmentationPyannoteModelConfig build() {
|
||||||
|
return new OfflineSpeakerSegmentationPyannoteModelConfig(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setModel(String model) {
|
||||||
|
this.model = model;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
// Copyright 2022-2023 by zhaoming
|
||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class OnlineStream {
|
||||||
|
private long ptr = 0;
|
||||||
|
|
||||||
|
public OnlineStream() {
|
||||||
|
System.loadLibrary("onnxruntime");
|
||||||
|
System.loadLibrary("sherpa-onnx-jni");
|
||||||
|
this.ptr = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OnlineStream(long ptr) {
|
||||||
|
this.ptr = ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getPtr() {
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPtr(long ptr) {
|
||||||
|
this.ptr = ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void acceptWaveform(float[] samples, int sampleRate) {
|
||||||
|
acceptWaveform(this.ptr, samples, sampleRate);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void inputFinished() {
|
||||||
|
inputFinished(this.ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setOption(String key, String value) {
|
||||||
|
setOption(this.ptr, key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getOption(String key) {
|
||||||
|
return getOption(this.ptr, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasOption(String key) {
|
||||||
|
return hasOption(this.ptr, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void release() {
|
||||||
|
close();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void close() {
|
||||||
|
// stream object must be release after used
|
||||||
|
if (this.ptr == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
delete(this.ptr);
|
||||||
|
this.ptr = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void finalize() throws Throwable {
|
||||||
|
close();
|
||||||
|
super.finalize();
|
||||||
|
}
|
||||||
|
|
||||||
|
private native void acceptWaveform(long ptr, float[] samples, int sampleRate);
|
||||||
|
|
||||||
|
private native void inputFinished(long ptr);
|
||||||
|
|
||||||
|
private native void setOption(long ptr, String key, String value);
|
||||||
|
|
||||||
|
private native String getOption(long ptr, String key);
|
||||||
|
|
||||||
|
private native boolean hasOption(long ptr, String key);
|
||||||
|
|
||||||
|
private native void delete(long ptr);
|
||||||
|
}
|
||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class SpeakerEmbeddingExtractor {
|
||||||
|
private long ptr = 0;
|
||||||
|
|
||||||
|
public SpeakerEmbeddingExtractor(SpeakerEmbeddingExtractorConfig config) {
|
||||||
|
System.loadLibrary("onnxruntime");
|
||||||
|
System.loadLibrary("sherpa-onnx-jni");
|
||||||
|
ptr = newFromFile(config);
|
||||||
|
if (ptr == 0) {
|
||||||
|
throw new IllegalArgumentException("Invalid SpeakerEmbeddingExtractorConfig: failed to create native SpeakerEmbeddingExtractor");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void finalize() throws Throwable {
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void release() {
|
||||||
|
if (this.ptr == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
delete(this.ptr);
|
||||||
|
this.ptr = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OnlineStream createStream() {
|
||||||
|
long p = createStream(ptr);
|
||||||
|
return new OnlineStream(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isReady(OnlineStream s) {
|
||||||
|
return isReady(ptr, s.getPtr());
|
||||||
|
}
|
||||||
|
|
||||||
|
public float[] compute(OnlineStream s) {
|
||||||
|
return compute(ptr, s.getPtr());
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getDim() {
|
||||||
|
return dim(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
private native void delete(long ptr);
|
||||||
|
|
||||||
|
private native long newFromFile(SpeakerEmbeddingExtractorConfig config);
|
||||||
|
|
||||||
|
private native long createStream(long ptr);
|
||||||
|
|
||||||
|
private native boolean isReady(long ptr, long streamPtr);
|
||||||
|
|
||||||
|
private native float[] compute(long ptr, long streamPtr);
|
||||||
|
|
||||||
|
private native int dim(long ptr);
|
||||||
|
}
|
||||||
+53
@@ -0,0 +1,53 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class SpeakerEmbeddingExtractorConfig {
|
||||||
|
private final String model;
|
||||||
|
private final int numThreads;
|
||||||
|
private final boolean debug;
|
||||||
|
private final String provider;
|
||||||
|
|
||||||
|
private SpeakerEmbeddingExtractorConfig(Builder builder) {
|
||||||
|
this.model = builder.model;
|
||||||
|
this.numThreads = builder.numThreads;
|
||||||
|
this.debug = builder.debug;
|
||||||
|
this.provider = builder.provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private String model = "";
|
||||||
|
private int numThreads = 1;
|
||||||
|
private boolean debug = true;
|
||||||
|
private String provider = "cpu";
|
||||||
|
|
||||||
|
public SpeakerEmbeddingExtractorConfig build() {
|
||||||
|
return new SpeakerEmbeddingExtractorConfig(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public Builder setModel(String model) {
|
||||||
|
this.model = model;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setNumThreads(int numThreads) {
|
||||||
|
this.numThreads = numThreads;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setDebug(boolean debug) {
|
||||||
|
this.debug = debug;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder setProvider(String provider) {
|
||||||
|
this.provider = provider;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+78
@@ -0,0 +1,78 @@
|
|||||||
|
// Copyright 2024 Xiaomi Corporation
|
||||||
|
|
||||||
|
package com.k2fsa.sherpa.onnx;
|
||||||
|
|
||||||
|
public class SpeakerEmbeddingManager {
|
||||||
|
private long ptr = 0;
|
||||||
|
|
||||||
|
public SpeakerEmbeddingManager(int dim) {
|
||||||
|
System.loadLibrary("onnxruntime");
|
||||||
|
System.loadLibrary("sherpa-onnx-jni");
|
||||||
|
ptr = create(dim);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void finalize() throws Throwable {
|
||||||
|
release();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void release() {
|
||||||
|
if (this.ptr == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
delete(this.ptr);
|
||||||
|
this.ptr = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean add(String name, float[] embedding) {
|
||||||
|
return add(ptr, name, embedding);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean add(String name, float[][] embedding) {
|
||||||
|
return addList(ptr, name, embedding);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean remove(String name) {
|
||||||
|
return remove(ptr, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String search(float[] embedding, float threshold) {
|
||||||
|
return search(ptr, embedding, threshold);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean verify(String name, float[] embedding, float threshold) {
|
||||||
|
return verify(ptr, name, embedding, threshold);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean contains(String name) {
|
||||||
|
return contains(ptr, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNumSpeakers() {
|
||||||
|
return numSpeakers(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String[] getAllSpeakerNames() {
|
||||||
|
return allSpeakerNames(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
private native long create(int dim);
|
||||||
|
|
||||||
|
private native void delete(long ptr);
|
||||||
|
|
||||||
|
private native boolean add(long ptr, String name, float[] embedding);
|
||||||
|
|
||||||
|
private native boolean addList(long ptr, String name, float[][] embedding);
|
||||||
|
|
||||||
|
private native boolean remove(long ptr, String name);
|
||||||
|
|
||||||
|
private native String search(long ptr, float[] embedding, float threshold);
|
||||||
|
|
||||||
|
private native boolean verify(long ptr, String name, float[] embedding, float threshold);
|
||||||
|
|
||||||
|
private native boolean contains(long ptr, String name);
|
||||||
|
|
||||||
|
private native int numSpeakers(long ptr);
|
||||||
|
|
||||||
|
private native String[] allSpeakerNames(long ptr);
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Microphone icon for the main page's tab-bar wakeword button.
|
||||||
|
Converted from ~/Downloads/noun-microphone-1368757.svg (Noun Project
|
||||||
|
icon #1368757); base fill is overridden by tint-color in app.css. -->
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="1200"
|
||||||
|
android:viewportHeight="1200">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF333333"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="m821.23 215.45v382.24c0 289.57-442.47 291.89-442.47 0v-382.24c0-287.26 442.47-287.26 442.47 0z" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF333333"
|
||||||
|
android:fillType="evenOdd"
|
||||||
|
android:pathData="m543.24 963.71c-294.21-27.801-328.96-298.84-328.96-546.72 0-41.699 88.031-41.699 97.297-4.6328 2.3164 199.23 4.6328 454.05 287.26 454.05 284.94 0 287.26-254.83 287.26-454.05 6.9492-39.383 99.613-37.066 99.613 4.6328 0 247.88-34.75 518.92-333.59 546.72v139h152.89c67.18 0 69.5 97.297 0 97.297h-414.67c-64.863 0-62.547-97.297 0-97.297h152.89v-139z" />
|
||||||
|
</vector>
|
||||||
@@ -25,6 +25,17 @@
|
|||||||
<item name="colorPrimary">@color/ns_primary</item>
|
<item name="colorPrimary">@color/ns_primary</item>
|
||||||
<item name="colorPrimaryDark">@color/ns_primaryDark</item>
|
<item name="colorPrimaryDark">@color/ns_primaryDark</item>
|
||||||
<item name="colorAccent">@color/ns_accent</item>
|
<item name="colorAccent">@color/ns_accent</item>
|
||||||
|
|
||||||
|
<!-- NativeScript builds the toolbar programmatically, so the
|
||||||
|
NativeScriptToolbarTheme overlay below (an inflation-time "theme"
|
||||||
|
item) never applies and the overflow icon falls back to the light
|
||||||
|
activity theme's dark textColorSecondary: black-on-dark. Tint the
|
||||||
|
overflow button itself instead; every page's bar is dark. -->
|
||||||
|
<item name="actionOverflowButtonStyle">@style/FaceclawOverflowButtonStyle</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="FaceclawOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
|
||||||
|
<item name="android:tint">#FFFFFF</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AppTheme" parent="AppThemeBase">
|
<style name="AppTheme" parent="AppThemeBase">
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Wearable Data Layer capability advertised to the watch, so the Faceclaw
|
||||||
|
watch app can find the phone that has Faceclaw installed. The watch app
|
||||||
|
advertises "faceclaw_watch" in return (see wear/). -->
|
||||||
|
<resources>
|
||||||
|
<string-array name="android_wear_capabilities">
|
||||||
|
<item>faceclaw_phone</item>
|
||||||
|
</string-array>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## 0.6.2 - 2026-08-30
|
||||||
|
* Preview Only mode works
|
||||||
|
* Voice input uses phone mic in preview mode
|
||||||
|
* Simulated ring input on phone screen is swipe-style rather than separate buttons
|
||||||
|
* Simulated watch input on phone screen is more minimalist
|
||||||
|
* Fix an issue where you could be missing the EvenHub font after skipping onboarding
|
||||||
|
* Terminal app has an activity indicator based on last-output-at tracking
|
||||||
|
|
||||||
|
## 0.6.1 - 2026-08-30
|
||||||
|
* Settings import/export scripts work on release builds
|
||||||
|
* Fixed an issue where the onboarding flow failed to detect the existing glasses firmware version
|
||||||
|
* Update launcher, files, and game UIs to work better with watch input
|
||||||
|
* Calendar app shows the day-of-the-month in its icon
|
||||||
|
* Move Roam settings out of the shared Settings app and into the Roam app itself
|
||||||
|
|
||||||
|
## 0.6 - 2026-08-29
|
||||||
|
- Start keeping a changelog and making signed binaries via GitHub Releases
|
||||||
|
|
||||||
@@ -5,16 +5,22 @@ for interfacing with Android SDK).
|
|||||||
|
|
||||||
Typescript parts are in app/. Java parts are in App_Resources/Android/src/main/java/com/faceclaw/app/.
|
Typescript parts are in app/. Java parts are in App_Resources/Android/src/main/java/com/faceclaw/app/.
|
||||||
|
|
||||||
If build.sh exists, it's a machine-specific wrapper that sets some environment
|
wear/ is a separate Gradle project (Kotlin + Compose for Wear OS): the watch
|
||||||
variables to point to where tools are installed, then runs `npm run build`.
|
remote that drives Faceclaw over the Wearable Data Layer. Its phone-side
|
||||||
If build_and_run.sh exists, it does everything build.sh does plus
|
counterparts are FaceclawWearBridge.java, app/native/wear-bridge.ts and
|
||||||
`nativescript run android --device <id> --justlaunch`,
|
app/g2/wear-remote.ts; the message format is in wear/PROTOCOL.md.
|
||||||
which will launch the app on the developer's phone if it is plugged in and has
|
|
||||||
adb enabled. If no phone is connected, it will still build but the install step
|
`build.sh` and `build_wear.sh` build the Android and Wear OS apps respectively.
|
||||||
will fail and the output will contain the string "Cannot find connected
|
`build_and_run.sh` builds the Android app then also installs it on a phone
|
||||||
devices." To lint and typecheck, prefer to use build.sh; if the user asks you
|
paired with `adb`. Building may require configuring environment variables
|
||||||
to run or test the app, use build_and_run.sh and then use `adb logcat` to view
|
(JAVA_HOME, ANDROID_HOME, PATH, ANDROID_KEYSTORE, ANDROID_KEYSTORE) to point at
|
||||||
the results.
|
relevant tools and an Android device ID to install on; do this in
|
||||||
|
build_paths.sh, which is created from build_paths.sh.template and not checked
|
||||||
|
into git.
|
||||||
|
|
||||||
|
To lint and typecheck, prefer to use build.sh; if the user asks you to run or
|
||||||
|
test the app, use build_and_run.sh and then use `adb logcat` to view the
|
||||||
|
results.
|
||||||
|
|
||||||
If you are working on low-level communication bits, consider checking out
|
If you are working on low-level communication bits, consider checking out
|
||||||
https://github.com/Commute773/g2-kit-unofficial/ and referring to ble/docs/
|
https://github.com/Commute773/g2-kit-unofficial/ and referring to ble/docs/
|
||||||
@@ -23,4 +29,10 @@ well as some communication test scripts and documentation of caveats that
|
|||||||
come up when communicating with the headset. There may already be an existing
|
come up when communicating with the headset. There may already be an existing
|
||||||
local checkout above this workspace at ../g2-kit-unofficial.
|
local checkout above this workspace at ../g2-kit-unofficial.
|
||||||
|
|
||||||
|
This Android app uses a modded firmware for the G2 smart glasses. Source code
|
||||||
|
to the corresponding firmware modifications lives in
|
||||||
|
https://github.com/jimrandomh/g2flash; there is a compiled version of the
|
||||||
|
firmware patch-set in app/g2/firmware/cfw-patches.ts. Strongly prefer making
|
||||||
|
changes to the Android app over making changes to changes to the firmware, as
|
||||||
|
firmware development is considerably more fraught.
|
||||||
|
|
||||||
@@ -74,3 +74,18 @@ https://support.evenrealities.com/hc/en-us/articles/14127464826511-Privacy-Polic
|
|||||||
Apps downloaded from the EvenHub app store come with their own privacy
|
Apps downloaded from the EvenHub app store come with their own privacy
|
||||||
policies.
|
policies.
|
||||||
|
|
||||||
|
|
||||||
|
## Wear OS Watch
|
||||||
|
|
||||||
|
The optional Faceclaw watch app (wear/) talks to the phone over Google Play
|
||||||
|
services' Wearable Data Layer, the same channel the watch uses for
|
||||||
|
notifications and other companion apps. Gestures, commands, the watch's own
|
||||||
|
speech-recognition results, and the mirrored glasses status and assistant
|
||||||
|
replies travel between your watch and your phone over their Bluetooth (or,
|
||||||
|
when paired that way, Wi-Fi) link; Faceclaw does not send any of it to a
|
||||||
|
server. Speech recognized on the watch uses the watch's system speech
|
||||||
|
recognizer, which may send audio to Google under Google's privacy policy:
|
||||||
|
|
||||||
|
Google: https://policies.google.com/privacy
|
||||||
|
|
||||||
|
The phone does nothing watch-related on phones without Google Play services.
|
||||||
@@ -9,71 +9,119 @@ glasses. The Android app itself can install and uninstall the custom firmware;
|
|||||||
it downloads the stock firmware from Even and applies patches generated from
|
it downloads the stock firmware from Even and applies patches generated from
|
||||||
https://github.com/jimrandomh/g2flash.
|
https://github.com/jimrandomh/g2flash.
|
||||||
|
|
||||||
|
User-facing documentation lives at https://faceclaw.org/.
|
||||||
|
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
Download faceclaw-<version>.apk from the GitHub releases section on the phone
|
||||||
|
that will be paired with the glasses and install it. On first run, the app will
|
||||||
|
walk you through pairing with the glasses and installing custom firmware.
|
||||||
|
|
||||||
|
|
||||||
|
## Compiling
|
||||||
|
|
||||||
|
If you want to customize faceclaw, the best way to do it is to download the
|
||||||
|
source code and using a coding agent such as Codex or Claude Code.
|
||||||
|
|
||||||
To compile, you will need an Android SDK environment with SDK version 35
|
To compile, you will need an Android SDK environment with SDK version 35
|
||||||
installed and licenses accepted, and the ANDROID_HOME pointing to the install.
|
installed and licenses accepted, and the ANDROID_HOME pointing to the install.
|
||||||
You will need Nativescript installed, and a JDK environment (v21), with the
|
You will need Nativescript installed, and a JDK environment (v21), with the
|
||||||
JAVA_HOME environment variable pointed at it. You will also need a reasonably
|
JAVA_HOME environment variable pointed at it. You will also need a reasonably
|
||||||
up to date npm and nodejs installed.
|
up to date npm and nodejs installed. You can put environment variables in
|
||||||
|
build_paths.sh and they will be used by all build commands.
|
||||||
|
|
||||||
To install a version that you compiled, you will need `adb` connected. Go to
|
To install a version that you compiled, you will need developer mode enabled on
|
||||||
Settings>About phone and tap the "Build number" field seven times. Then plug
|
your phone, and `adb` connected. To enable developer mode, go to Settings>About
|
||||||
the phone's USB-C port into your computer, authorize access on the phone, then
|
phone and tap the "Build number" field seven times. Then plug the phone's USB-C
|
||||||
run `nativescript run android
|
port into your computer, authorize access on the phone, and run
|
||||||
|
`./build_and_run.sh` to install.
|
||||||
|
|
||||||
|
Note that if you have installed a signed release build, you will have to
|
||||||
|
uninstall it before installing a customized version. Use scripts/pull_config.sh
|
||||||
|
to export a copy of your configuration first, and scripts/push_config.sh to
|
||||||
|
import it into the new version.
|
||||||
|
|
||||||
The compile, run
|
|
||||||
'npm run build'
|
|
||||||
To install, run
|
|
||||||
`nativescript run android --juslaunch`
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
* A voice assistant that wakes up when you say "Hey Even", transcribes text
|
<!-- Generated from website/content/features.md by scripts/sync-site.mjs; edit there. -->
|
||||||
with an on-device model, OpenAI Whisper, ElevenLabs, or Soniox API, and
|
<!-- BEGIN GENERATED: features -->
|
||||||
responds to queries and commands using an onboard model (Qwen3 4B, slow)
|
* **A voice assistant** that wakes up when you say "Hey Even", transcribes
|
||||||
or with an Anthropic or OpenAI model (requires an API key), or using your
|
text with an on-device model, OpenAI Whisper, ElevenLabs, or Soniox API,
|
||||||
own long-running OpenClaw agent (see "Connecting an external agent" below).
|
and responds to queries and commands using an onboard model (Qwen3 4B,
|
||||||
* Multitasking, with an app-switcher sidebar and app launcher
|
slow) or with an Anthropic or OpenAI model (requires an API key), or using
|
||||||
* Mostly-compatible with EvenHub apps
|
your own long-running OpenClaw agent.
|
||||||
* A lock screen; glasses lock automatically when you take them off and unlock
|
* **Multitasking**, with an app-switcher sidebar and app launcher.
|
||||||
when you unlock your phone
|
* **Mostly-compatible with EvenHub apps.**
|
||||||
* Full-screen apps can use the full 640x480 display area (rather than the
|
* **A lock screen**; glasses lock automatically when you take them off and
|
||||||
576x288 that EvenHub apps can use)
|
unlock when you unlock your phone.
|
||||||
* Integration with Android notifications: A top-bar that shows the
|
* **The full display.** Full-screen apps can use the full 640x480 display
|
||||||
same icons your phone does, popups when notifications arrive, and menu
|
area, rather than the 576x288 that EvenHub apps can use.
|
||||||
items to dismiss or use Android-app-provided custom actions like mark as
|
* **Integration with Android notifications**: a top bar that shows the same
|
||||||
read or quick reply.
|
icons your phone does, popups when notifications arrive, and menu items to
|
||||||
* Mirror terminal apps such as Claude Code or Codex CLI with g2mirror
|
dismiss or use Android-app-provided custom actions like mark as read or
|
||||||
(https://github.com/jimrandomh/g2mirror), view them on the glasses, and
|
quick reply.
|
||||||
send them inputs with the voice assistant
|
* **Terminal mirroring.** Mirror terminal apps such as Claude Code or Codex
|
||||||
* Media player controls including playlist and media library navigation,
|
CLI with [g2mirror](https://github.com/jimrandomh/g2mirror), view them on
|
||||||
compatible with most Android media players
|
the glasses, and send them inputs with the voice assistant.
|
||||||
* Turn-by-turn directions (requires a Mapbox API token)
|
* **Media player controls** including playlist and media library navigation,
|
||||||
* Nightscout, an app for viewing blood-glucose data (requires a cloud server
|
compatible with most Android media players.
|
||||||
and API token)
|
* **Turn-by-turn directions** (requires a Mapbox API token).
|
||||||
* Power management: the glasses go to sleep properly when the screen is off,
|
* **Nightscout**, an app for viewing blood-glucose data (requires a cloud
|
||||||
and wake when you double-tap the ring or speak the wakeword, allowing
|
server and API token).
|
||||||
|
* **Power management**: the glasses go to sleep properly when the screen is
|
||||||
|
off, and wake when you double-tap the ring or speak the wakeword, allowing
|
||||||
battery life similar to the stock Even app.
|
battery life similar to the stock Even app.
|
||||||
* Connection management with auto-reconnect, and autodetection of conflict
|
* **Connection management** with auto-reconnect, and autodetection of
|
||||||
with the official Even Realities app
|
conflict with the official Even Realities app.
|
||||||
* Bluetooth pairing that scans for nearby glasses and identifies each pair
|
* **A Wear OS watch app** that replaces (and outdoes) the R1 ring: tap,
|
||||||
before connecting: model, frame shape, and colour decoded from the
|
swipe, hold and crown gestures, side buttons, app launching and window
|
||||||
|
switching, voice or keyboard queries to the assistant with the reply on
|
||||||
|
your wrist, typing into apps, and glasses status/lock/display control.
|
||||||
|
* **On-phone screen mirroring with touch control**: tap what you see on the
|
||||||
|
mirror (sidebar icons, launcher cells), or use the phone's own touchpad,
|
||||||
|
d-pad and Back/Menu buttons — the same spatial scheme as the watch — plus a
|
||||||
|
compact ring simulator. A display-mode picker (576×288 band, 576×480 tall,
|
||||||
|
or the full 640×480 panel with an auto-hiding sidebar) and a brightness
|
||||||
|
slider with an Auto toggle sit beside the mirror.
|
||||||
|
* **Bluetooth pairing** that scans for nearby glasses and identifies each
|
||||||
|
pair before connecting: model, frame shape, and colour decoded from the
|
||||||
advertised serial (with product photos), left and right arms matched to
|
advertised serial (with product photos), left and right arms matched to
|
||||||
each other by that serial, an estimated distance so the pair in your hand
|
each other by that serial, an estimated distance so the pair in your hand
|
||||||
sorts first, and the optional R1 ring
|
sorts first, and the optional R1 ring.
|
||||||
* On-phone screen mirroring and simulated ring input
|
* **Dual-language NativeScript architecture**, with Java for the
|
||||||
* Dual-language NativeScript architecture with Java for the multithreaded
|
multithreaded Android API and bluetooth stack bits, Typescript for the bits
|
||||||
Android API and bluetooth stack bits, Typescript for the bits you want to
|
you want to hack on.
|
||||||
hack on
|
<!-- END GENERATED: features -->
|
||||||
|
|
||||||
|
## Watch remote (Wear OS)
|
||||||
|
|
||||||
|
The `wear/` directory holds a companion app for Wear OS 3+ watches that turns
|
||||||
|
the watch into a remote for the glasses. The whole watch face is a touchpad
|
||||||
|
that mirrors the ring (tap, double-tap, hold, swipe, crown scrolling, side
|
||||||
|
buttons), and beyond the ring it can launch apps, switch and close windows,
|
||||||
|
wake/sleep/lock the display, send spoken or typed queries straight to the
|
||||||
|
assistant (using the watch's own microphone) and show the reply on the wrist,
|
||||||
|
and type text into apps such as the terminal. Its swipes are a spatial
|
||||||
|
control scheme the ring never had, with no mode to enter first: the
|
||||||
|
launcher highlights one app and moves it by rows and columns, right goes
|
||||||
|
into things (sidebar → window, settings section → items, next track in
|
||||||
|
Music), left backs out, tap selects, hold opens the context menu, double-tap
|
||||||
|
or a two-finger tap is back everywhere, and two wrist twists go back; up/down
|
||||||
|
scroll and right/left select/back everywhere else. The ring's own scheme is
|
||||||
|
unchanged — watch input is tagged as a separate source. Faceclaw's Settings > Watch
|
||||||
|
section has the phone-side switches. See [wear/README.md](wear/README.md) for
|
||||||
|
building and installing it; it is a separate Gradle build, sideloaded over
|
||||||
|
adb, and needs no Play Store. The phone side requires Google Play services.
|
||||||
|
|
||||||
## Connecting an external agent (OpenClaw)
|
## Connecting an external agent (OpenClaw)
|
||||||
|
|
||||||
@@ -127,7 +175,7 @@ https://github.com/jimrandomh/faceclaw.
|
|||||||
The Typescript and Java code in this repository runs on your phone, not on the
|
The Typescript and Java code in this repository runs on your phone, not on the
|
||||||
glasses themselves, and (with the narrow exception of the firmware-updating
|
glasses themselves, and (with the narrow exception of the firmware-updating
|
||||||
tool), can't hurt your hardware. For changes to the glasses firmware, refer to
|
tool), can't hurt your hardware. For changes to the glasses firmware, refer to
|
||||||
[g2flash](https://github.com/jimrandomh/faceclaw); changes there require more
|
[g2flash](https://github.com/jimrandomh/g2flash); changes there require more
|
||||||
caution.
|
caution.
|
||||||
|
|
||||||
Faceclaw is Free Software (GPLv3). Please only contribute code that you wrote
|
Faceclaw is Free Software (GPLv3). Please only contribute code that you wrote
|
||||||
|
|||||||
+383
@@ -15,6 +15,29 @@ ActionItem {
|
|||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The main page's custom titleView: title left, connection status and the
|
||||||
|
* warning triangle right-aligned beside the overflow menu. */
|
||||||
|
.action-bar-title {
|
||||||
|
color: #ffffff;
|
||||||
|
font-size: 18;
|
||||||
|
font-weight: bold;
|
||||||
|
vertical-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-bar-status {
|
||||||
|
color: #ffffff;
|
||||||
|
font-size: 14;
|
||||||
|
margin-right: 12;
|
||||||
|
vertical-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The emoji brings its own yellow; the padding widens the tap target. */
|
||||||
|
.action-bar-warning {
|
||||||
|
font-size: 18;
|
||||||
|
padding: 4 6;
|
||||||
|
vertical-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
TextField {
|
TextField {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #222222;
|
color: #222222;
|
||||||
@@ -50,6 +73,31 @@ Button.-primary {
|
|||||||
tint-color: #e6e6e6;
|
tint-color: #e6e6e6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* License / privacy-policy links in the onboarding disclaimer footer. The
|
||||||
|
* padding widens the tap target beyond the small text. */
|
||||||
|
.footer-link {
|
||||||
|
color: #3b6fd6;
|
||||||
|
font-size: 15;
|
||||||
|
text-decoration: underline;
|
||||||
|
padding: 4 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .footer-link {
|
||||||
|
color: #8ab0ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-link-separator {
|
||||||
|
color: #777777;
|
||||||
|
font-size: 15;
|
||||||
|
padding: 4 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Bundled project docs (phone-ui/document-page). LICENSE and PRIVACY are
|
||||||
|
* hard-wrapped plain text, so keep the size modest to limit rewrapping. */
|
||||||
|
.document-text {
|
||||||
|
font-size: 13;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Stands in for the lens preview when showing it would be misleading (silent
|
* Stands in for the lens preview when showing it would be misleading (silent
|
||||||
* mode, or a disconnect explained by a flat battery). Sized by the view model
|
* mode, or a disconnect explained by a flat battery). Sized by the view model
|
||||||
@@ -77,6 +125,147 @@ Button.-primary {
|
|||||||
border-radius: 8;
|
border-radius: 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Modal behind the action bar's warning triangle: the problem-status warnings
|
||||||
|
* that used to sit inline on the main page, each with its fix-it button.
|
||||||
|
* The width is set from the view model (near-full-width on phones, capped on
|
||||||
|
* tablets); the padding lives on the content stack because a ScrollView does
|
||||||
|
* not apply its own padding to its content. */
|
||||||
|
.warnings-modal {
|
||||||
|
margin: 16;
|
||||||
|
background-color: #f6f6f6;
|
||||||
|
color: #222222;
|
||||||
|
border-color: #222222;
|
||||||
|
border-width: 1;
|
||||||
|
border-radius: 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.warnings-modal-content {
|
||||||
|
padding: 16;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The modal stays light in dark mode; the .ns-dark pairing outguns the
|
||||||
|
* theme's dark-mode recolour of Label/.h2 so the title doesn't go
|
||||||
|
* white-on-light-gray. */
|
||||||
|
.warnings-modal Label,
|
||||||
|
.ns-dark .warnings-modal Label {
|
||||||
|
color: #222222;
|
||||||
|
}
|
||||||
|
|
||||||
|
.warnings-modal-item {
|
||||||
|
margin-bottom: 12;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The phone's controller for the glasses (phone-ui/remote-controls.xml). */
|
||||||
|
.remote-controls {
|
||||||
|
margin: 0 8 0 8;
|
||||||
|
}
|
||||||
|
/* The Settings / Watch / Ring tab bar above the controls. */
|
||||||
|
.controls-tab-bar {
|
||||||
|
margin-bottom: 8;
|
||||||
|
}
|
||||||
|
.tab-button {
|
||||||
|
font-size: 14;
|
||||||
|
padding: 8 0;
|
||||||
|
margin: 0 2;
|
||||||
|
border-radius: 6;
|
||||||
|
background-color: #e2e2e2;
|
||||||
|
color: #333333;
|
||||||
|
}
|
||||||
|
.tab-button-selected {
|
||||||
|
background-color: #424242;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
/* The wakeword button at the tab bar's right edge: icon-only, narrower than
|
||||||
|
* the tabs, and never in the selected state (it isn't a tab). It is a
|
||||||
|
* button-styled GridLayout (Buttons can't hold images), so it borrows the
|
||||||
|
* .tab-button look and adds the elevation MaterialButtons get for free. */
|
||||||
|
.tab-mic-button {
|
||||||
|
width: 56;
|
||||||
|
/* The real MaterialButtons render 48dp tall inside a 60dp layout box (6dp
|
||||||
|
* insets top and bottom); the margins and explicit height reproduce that.
|
||||||
|
* The height also bounds the tile's measure, without which its star row
|
||||||
|
* would collapse to content and pin the icon to the top. */
|
||||||
|
height: 48;
|
||||||
|
margin: 6 2;
|
||||||
|
android-elevation: 2;
|
||||||
|
}
|
||||||
|
.tab-mic-icon {
|
||||||
|
height: 20;
|
||||||
|
tint-color: #333333;
|
||||||
|
}
|
||||||
|
.ns-dark .tab-mic-icon {
|
||||||
|
tint-color: #cccccc;
|
||||||
|
}
|
||||||
|
.ns-dark .tab-button {
|
||||||
|
background-color: #333333;
|
||||||
|
color: #cccccc;
|
||||||
|
}
|
||||||
|
.ns-dark .tab-button-selected {
|
||||||
|
background-color: #e2e2e2;
|
||||||
|
color: #222222;
|
||||||
|
}
|
||||||
|
/* Settings tab rows. */
|
||||||
|
.settings-row {
|
||||||
|
margin-bottom: 8;
|
||||||
|
}
|
||||||
|
.settings-row-label {
|
||||||
|
font-size: 14;
|
||||||
|
margin-right: 10;
|
||||||
|
}
|
||||||
|
.mode-button {
|
||||||
|
font-size: 13;
|
||||||
|
padding: 6 10;
|
||||||
|
margin-right: 6;
|
||||||
|
}
|
||||||
|
.brightness-icon {
|
||||||
|
font-size: 16;
|
||||||
|
margin: 0 4 0 4;
|
||||||
|
color: #444444;
|
||||||
|
}
|
||||||
|
.auto-toggle Label {
|
||||||
|
font-size: 13;
|
||||||
|
margin-right: 2;
|
||||||
|
}
|
||||||
|
.touchpad {
|
||||||
|
height: 230;
|
||||||
|
background-color: #1f1f1f;
|
||||||
|
border-radius: 14;
|
||||||
|
border-width: 1;
|
||||||
|
border-color: #3a3a3a;
|
||||||
|
color: #f0f0f0;
|
||||||
|
margin-top: 2;
|
||||||
|
}
|
||||||
|
.pad-focus {
|
||||||
|
font-size: 20;
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
.pad-legend {
|
||||||
|
font-size: 11;
|
||||||
|
color: #8a8a8a;
|
||||||
|
margin-bottom: 8;
|
||||||
|
}
|
||||||
|
.action-row {
|
||||||
|
margin-top: 6;
|
||||||
|
}
|
||||||
|
.action-button {
|
||||||
|
margin: 2;
|
||||||
|
font-size: 14;
|
||||||
|
}
|
||||||
|
/* Ring tab: the same touchpad, but portrait like the ring's own pad. */
|
||||||
|
.ring-touchpad {
|
||||||
|
width: 150;
|
||||||
|
height: 250;
|
||||||
|
}
|
||||||
|
/* Cosmetic marks mirroring the six rectangles on the physical ring's touch
|
||||||
|
strip; barely lighter than the pad so they read as texture, not buttons. */
|
||||||
|
.ring-pad-marking {
|
||||||
|
width: 18;
|
||||||
|
height: 5;
|
||||||
|
border-radius: 2;
|
||||||
|
background-color: #2a2a2a;
|
||||||
|
horizontal-align: center;
|
||||||
|
vertical-align: center;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
* Pairing scan list (phone-ui/pairing-page). Rows are Repeater items: product
|
* Pairing scan list (phone-ui/pairing-page). Rows are Repeater items: product
|
||||||
* art (or a colourway swatch) on the left, decoded SKU + proximity + serial in
|
* art (or a colourway swatch) on the left, decoded SKU + proximity + serial in
|
||||||
@@ -199,6 +388,29 @@ Button.pairing-link {
|
|||||||
border-width: 0;
|
border-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Permissions screen (phone-ui/permissions-page). Cards reuse the pairing-row
|
||||||
|
* / pairing-title / pairing-badge look above; these add the explanation body
|
||||||
|
* and the already-granted checkmark.
|
||||||
|
*/
|
||||||
|
.permissions-description {
|
||||||
|
font-size: 13;
|
||||||
|
color: #555555;
|
||||||
|
margin-top: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.permissions-check {
|
||||||
|
font-size: 24;
|
||||||
|
color: #2e7d32;
|
||||||
|
margin-left: 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Continue with required permissions still missing: looks disabled but stays
|
||||||
|
* tappable (the tap raises an are-you-sure prompt instead of being ignored). */
|
||||||
|
Button.permissions-primary-dimmed {
|
||||||
|
opacity: 0.45;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Dark-mode pairing page. The cards keep their light-mode look above; here
|
* Dark-mode pairing page. The cards keep their light-mode look above; here
|
||||||
* they go dark-gray, and every text colour set above gets a light counterpart
|
* they go dark-gray, and every text colour set above gets a light counterpart
|
||||||
@@ -277,3 +489,174 @@ Button.pairing-link {
|
|||||||
.ns-dark Button.pairing-link {
|
.ns-dark Button.pairing-link {
|
||||||
color: #7da7f5;
|
color: #7da7f5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ns-dark .permissions-description {
|
||||||
|
color: #b0b0b0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .permissions-check {
|
||||||
|
color: #7bc47f;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Conversation review (phone-ui/conversations-page, conversation-page,
|
||||||
|
* speakers-page). Cards follow the pairing-row look; speaker/emotion chips
|
||||||
|
* get their background colour inline (per-speaker / per-emotion), so the
|
||||||
|
* classes only carry shape and dark text that reads on the pastel palette.
|
||||||
|
*/
|
||||||
|
.conversation-row {
|
||||||
|
background-color: #f4f4f4;
|
||||||
|
border-color: #dddddd;
|
||||||
|
border-width: 1;
|
||||||
|
border-radius: 10;
|
||||||
|
padding: 10;
|
||||||
|
margin-bottom: 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-title {
|
||||||
|
font-size: 16;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #222222;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-meta {
|
||||||
|
font-size: 12;
|
||||||
|
color: #666666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-empty {
|
||||||
|
color: #777777;
|
||||||
|
font-size: 14;
|
||||||
|
padding: 8 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ask-answer {
|
||||||
|
font-size: 15;
|
||||||
|
color: #222222;
|
||||||
|
padding: 4 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .ask-answer {
|
||||||
|
color: #e6e6e6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-status {
|
||||||
|
font-size: 13;
|
||||||
|
color: #2a5bc4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.speaker-chip {
|
||||||
|
font-size: 12;
|
||||||
|
color: #222222;
|
||||||
|
border-radius: 10;
|
||||||
|
padding: 2 8;
|
||||||
|
margin: 0 6 4 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.speaker-chip-selected {
|
||||||
|
border-width: 2;
|
||||||
|
border-color: #222222;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.speaker-tag {
|
||||||
|
font-size: 11;
|
||||||
|
color: #555555;
|
||||||
|
background-color: #e6e6e6;
|
||||||
|
border-radius: 8;
|
||||||
|
padding: 1 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.speaker-wearer-badge {
|
||||||
|
font-size: 11;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #2a5bc4;
|
||||||
|
background-color: #dbe6fb;
|
||||||
|
border-radius: 8;
|
||||||
|
padding: 1 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transcript-row {
|
||||||
|
border-radius: 8;
|
||||||
|
padding: 8;
|
||||||
|
margin-bottom: 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transcript-row-playing {
|
||||||
|
background-color: #e6f0ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transcript-translation {
|
||||||
|
font-size: 13;
|
||||||
|
font-style: italic;
|
||||||
|
color: #777777;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transcript-time {
|
||||||
|
font-size: 11;
|
||||||
|
color: #888888;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transcript-emotion {
|
||||||
|
font-size: 11;
|
||||||
|
color: #222222;
|
||||||
|
border-radius: 8;
|
||||||
|
padding: 1 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.transcript-play {
|
||||||
|
font-size: 16;
|
||||||
|
color: #2a5bc4;
|
||||||
|
margin-left: 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .conversation-row {
|
||||||
|
background-color: #2e2e2e;
|
||||||
|
border-color: #4a4a4a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .conversation-title {
|
||||||
|
color: #f0f0f0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .conversation-meta {
|
||||||
|
color: #a0a0a0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .conversation-empty {
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .conversation-status {
|
||||||
|
color: #7da7f5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .speaker-chip-selected {
|
||||||
|
border-color: #f0f0f0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .speaker-tag {
|
||||||
|
color: #cccccc;
|
||||||
|
background-color: #3c3c3c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .speaker-wearer-badge {
|
||||||
|
color: #a8c4f5;
|
||||||
|
background-color: #2a3b5e;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .transcript-row-playing {
|
||||||
|
background-color: #333c4c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .transcript-translation {
|
||||||
|
color: #999999;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .transcript-time {
|
||||||
|
color: #909090;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ns-dark .transcript-play {
|
||||||
|
color: #7da7f5;
|
||||||
|
}
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
import { type AppDefinition } from "./app-definition";
|
import { type AppDefinition } from "./app-definition";
|
||||||
import launcherApp from "./launcher";
|
import launcherApp from "./launcher";
|
||||||
import timerApp from "./timer";
|
import timerApp from "./timer";
|
||||||
|
import calculatorApp from "./calculator";
|
||||||
import terminalApp from "./terminal";
|
import terminalApp from "./terminal";
|
||||||
import filesApp from "./files";
|
import filesApp from "./files";
|
||||||
import musicApp from "./music";
|
import musicApp from "./music";
|
||||||
import nightscoutApp from "./nightscout";
|
import nightscoutApp from "./nightscout";
|
||||||
import transcribeApp from "./transcribe";
|
import transcribeApp from "./transcribe";
|
||||||
|
import microphonesApp from "./microphones";
|
||||||
import notificationsApp from "./notifications";
|
import notificationsApp from "./notifications";
|
||||||
import calendarApp from "./calendar";
|
import calendarApp from "./calendar";
|
||||||
import weatherApp from "./weather";
|
import weatherApp from "./weather";
|
||||||
@@ -28,11 +30,13 @@ import settingsApp from "./settings";
|
|||||||
export const ALL_APPS: readonly AppDefinition[] = [
|
export const ALL_APPS: readonly AppDefinition[] = [
|
||||||
launcherApp,
|
launcherApp,
|
||||||
timerApp,
|
timerApp,
|
||||||
|
calculatorApp,
|
||||||
terminalApp,
|
terminalApp,
|
||||||
filesApp,
|
filesApp,
|
||||||
musicApp,
|
musicApp,
|
||||||
nightscoutApp,
|
nightscoutApp,
|
||||||
transcribeApp,
|
transcribeApp,
|
||||||
|
microphonesApp,
|
||||||
notificationsApp,
|
notificationsApp,
|
||||||
calendarApp,
|
calendarApp,
|
||||||
weatherApp,
|
weatherApp,
|
||||||
|
|||||||
@@ -106,6 +106,8 @@ export async function launchWorkerAppWindow(
|
|||||||
* windows are open).
|
* windows are open).
|
||||||
*/
|
*/
|
||||||
matchExistingBy?: "appId" | "windowId";
|
matchExistingBy?: "appId" | "windowId";
|
||||||
|
/** Deliver watch swipes raw instead of the fallback (see WorkerWindowSpec). */
|
||||||
|
acceptsDirectional?: boolean;
|
||||||
},
|
},
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const existing = shell
|
const existing = shell
|
||||||
@@ -125,6 +127,7 @@ export async function launchWorkerAppWindow(
|
|||||||
iconLetter: options.iconLetter,
|
iconLetter: options.iconLetter,
|
||||||
icon: options.icon,
|
icon: options.icon,
|
||||||
focus: true,
|
focus: true,
|
||||||
|
acceptsDirectional: options.acceptsDirectional,
|
||||||
});
|
});
|
||||||
ctx.appendLog(`launched ${options.windowId}`);
|
ctx.appendLog(`launched ${options.windowId}`);
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,8 @@
|
|||||||
* foreground and the screen is on (losing either auto-pauses).
|
* foreground and the screen is on (losing either auto-pauses).
|
||||||
*
|
*
|
||||||
* Controls (in play): scroll moves the piece, click rotates, long-press hard
|
* Controls (in play): scroll moves the piece, click rotates, long-press hard
|
||||||
* drops, double-click pauses. Paused: click resumes, double-click yields
|
* drops, double-click pauses. Watch swipes are spatial: left/right move,
|
||||||
|
* up rotates, down hard-drops. Paused: click resumes, double-click yields
|
||||||
* focus, long-press opens the window menu.
|
* focus, long-press opens the window menu.
|
||||||
*/
|
*/
|
||||||
import "@nativescript/core/globals";
|
import "@nativescript/core/globals";
|
||||||
@@ -14,15 +15,17 @@ import { prepareFrameDraws } from "../../graphics/glyph-wire";
|
|||||||
import { getFont } from "../../graphics/bdffont";
|
import { getFont } from "../../graphics/bdffont";
|
||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import * as frameTimings from "../../native/frame-timings";
|
import * as frameTimings from "../../native/frame-timings";
|
||||||
import type { DashboardInputEvent } from "../../ui/layers";
|
import { getActiveDisplay } from "../../native/active-display";
|
||||||
import { buildSoundSequencePayload, type Step } from "../../ui/sound-effects";
|
import { buildSoundSequencePayload, type Step } from "../../ui/sound-effects";
|
||||||
import { defaultWindowMenuItems, WindowMenu } from "../../ui/window-menu";
|
import { defaultWindowMenuItems, WindowMenu } from "../../ui/window-menu";
|
||||||
import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window";
|
import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window";
|
||||||
import {
|
import {
|
||||||
|
directionalFallback,
|
||||||
GESTURE_CLICK,
|
GESTURE_CLICK,
|
||||||
GESTURE_DOUBLE_CLICK,
|
GESTURE_DOUBLE_CLICK,
|
||||||
GESTURE_LONG_PRESS,
|
GESTURE_LONG_PRESS,
|
||||||
GESTURE_SCROLL,
|
GESTURE_SCROLL,
|
||||||
|
type InputEvent,
|
||||||
} from "../../ui/gestures";
|
} from "../../ui/gestures";
|
||||||
|
|
||||||
declare const global: any;
|
declare const global: any;
|
||||||
@@ -165,6 +168,12 @@ function post(message: WorkerAppReply): void {
|
|||||||
global.postMessage(message);
|
global.postMessage(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The host queues messages until this arrives: posts to a worker whose bundle
|
||||||
|
// is still evaluating can be silently dropped (see WorkerAppHost). Top-level
|
||||||
|
// evaluation is synchronous, so the handler below is installed before any
|
||||||
|
// queued message can be delivered.
|
||||||
|
post({ type: "worker-ready" });
|
||||||
|
|
||||||
global.onmessage = (event: { data: WorkerAppMessage }) => {
|
global.onmessage = (event: { data: WorkerAppMessage }) => {
|
||||||
const message = event.data;
|
const message = event.data;
|
||||||
switch (message.type) {
|
switch (message.type) {
|
||||||
@@ -213,7 +222,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => {
|
|||||||
// Marks the main-thread -> worker hop, which is otherwise an
|
// Marks the main-thread -> worker hop, which is otherwise an
|
||||||
// unexplained gap inside the shell's handle-input span.
|
// unexplained gap inside the shell's handle-input span.
|
||||||
frameTimings.logFrame(message.frameId, `input received in ${message.windowId} worker`);
|
frameTimings.logFrame(message.frameId, `input received in ${message.windowId} worker`);
|
||||||
handleInput(window, message.event as DashboardInputEvent, message.frameId);
|
handleInput(window, message.event as InputEvent, message.frameId);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "render": {
|
case "render": {
|
||||||
@@ -302,11 +311,12 @@ function windowMenu(window: BlocksWindow): WindowMenu {
|
|||||||
return window.menu;
|
return window.menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleInput(window: BlocksWindow, event: DashboardInputEvent, frameId: number): void {
|
function handleInput(window: BlocksWindow, event: InputEvent, frameId: number): void {
|
||||||
// An open window menu owns all input (it closes itself via pop).
|
// An open window menu owns all input (it closes itself via pop); menus are
|
||||||
|
// list UIs, so watch swipes take their standard fallback meanings there.
|
||||||
if (window.menu?.isOpen()) {
|
if (window.menu?.isOpen()) {
|
||||||
window.menu
|
window.menu
|
||||||
.handleInput(event)
|
.handleInput(directionalFallback(event))
|
||||||
.catch((error) => console.error(`blocks menu input failed: ${error}`))
|
.catch((error) => console.error(`blocks menu input failed: ${error}`))
|
||||||
.then(() => renderAndSubmit(window, frameId));
|
.then(() => renderAndSubmit(window, frameId));
|
||||||
return;
|
return;
|
||||||
@@ -319,14 +329,24 @@ function handleInput(window: BlocksWindow, event: DashboardInputEvent, frameId:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handlePlayingInput(window: BlocksWindow, event: DashboardInputEvent, frameId: number): void {
|
function handlePlayingInput(window: BlocksWindow, event: InputEvent, frameId: number): void {
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "scroll-up":
|
case "scroll-up":
|
||||||
|
case "swipe-left":
|
||||||
tryMove(window, -1, 0);
|
tryMove(window, -1, 0);
|
||||||
break;
|
break;
|
||||||
case "scroll-down":
|
case "scroll-down":
|
||||||
|
case "swipe-right":
|
||||||
tryMove(window, 1, 0);
|
tryMove(window, 1, 0);
|
||||||
break;
|
break;
|
||||||
|
// Watch swipes are spatial: left/right move the piece, up rotates it,
|
||||||
|
// down hard-drops (like long-press).
|
||||||
|
case "swipe-up":
|
||||||
|
tryRotate(window);
|
||||||
|
break;
|
||||||
|
case "swipe-down":
|
||||||
|
hardDrop(window);
|
||||||
|
break;
|
||||||
case "click":
|
case "click":
|
||||||
tryRotate(window);
|
tryRotate(window);
|
||||||
break;
|
break;
|
||||||
@@ -345,9 +365,9 @@ function handlePlayingInput(window: BlocksWindow, event: DashboardInputEvent, fr
|
|||||||
renderAndSubmit(window, frameId);
|
renderAndSubmit(window, frameId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Input while paused or game over. */
|
/** Input while paused or game over. Swipes take their standard fallback meanings. */
|
||||||
function handleIdleInput(window: BlocksWindow, event: DashboardInputEvent, frameId: number): void {
|
function handleIdleInput(window: BlocksWindow, event: InputEvent, frameId: number): void {
|
||||||
switch (event.type) {
|
switch (directionalFallback(event).type) {
|
||||||
case "click":
|
case "click":
|
||||||
if (window.phase === "game-over") resetGame(window);
|
if (window.phase === "game-over") resetGame(window);
|
||||||
window.phase = "playing";
|
window.phase = "playing";
|
||||||
@@ -647,9 +667,9 @@ function renderAndSubmit(window: BlocksWindow, inputFrameId: number): void {
|
|||||||
frameTimings.finishFrame(frameId, "discarded: blocks content unchanged");
|
frameTimings.finishFrame(frameId, "discarded: blocks content unchanged");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const communicator = com.faceclaw.app.FaceclawBleCommunicator.getActive();
|
const communicator = getActiveDisplay();
|
||||||
if (!communicator) {
|
if (!communicator) {
|
||||||
frameTimings.finishFrame(frameId, "discarded: no active communicator");
|
frameTimings.finishFrame(frameId, "discarded: no active display");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const { image, draws } = frameTimings.span(frameId, "flatten", () => flattenPlanesWithDraws(planes));
|
const { image, draws } = frameTimings.span(frameId, "flatten", () => flattenPlanesWithDraws(planes));
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ const blocksApp: AppDefinition = {
|
|||||||
title: "Blocks",
|
title: "Blocks",
|
||||||
iconLetter: "B",
|
iconLetter: "B",
|
||||||
icon: "l-piece",
|
icon: "l-piece",
|
||||||
|
acceptsDirectional: true,
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,150 @@
|
|||||||
|
/**
|
||||||
|
* Calculator window wiring: the in-process window, its long-press menu (mode
|
||||||
|
* follow-ups, clear, settings), the assistant tools, and the voice/text
|
||||||
|
* plumbing into the layer.
|
||||||
|
*
|
||||||
|
* The coordinator is a module singleton on purpose: a
|
||||||
|
* problem stated through the assistant's calculate tool is still standing
|
||||||
|
* when the wearer opens the window, and "graph it" there refers to it. The
|
||||||
|
* same session also survives closing and reopening the window.
|
||||||
|
*/
|
||||||
|
import {
|
||||||
|
createInProcessWindow,
|
||||||
|
type InProcessAppOptions,
|
||||||
|
type InProcessWindow,
|
||||||
|
} from "../../ui/shell/in-process-window";
|
||||||
|
import { type MenuItem } from "../../ui/menu";
|
||||||
|
import { openSettingsSubMenu } from "../../ui/dashboard/settings-panel";
|
||||||
|
import { enumSettingMenuItem, toggleSettingMenuItem } from "../../ui/dashboard-settings";
|
||||||
|
import { shell } from "../../ui/shell/shell";
|
||||||
|
import { toolRegistry } from "../../assistant/tool-registry";
|
||||||
|
import { type ToolSpec } from "../../assistant/tool-registry";
|
||||||
|
import { MathCoordinator } from "./math/coordinator";
|
||||||
|
import { rewriteSpokenProblem } from "./calculator-llm";
|
||||||
|
import {
|
||||||
|
CalculatorLayer,
|
||||||
|
calculatorDegreesSetting,
|
||||||
|
calculatorListeningSetting,
|
||||||
|
calculatorModeSetting,
|
||||||
|
} from "./calculator";
|
||||||
|
import { CALCULATOR_MODES, modeLabel } from "./calculator-commands";
|
||||||
|
|
||||||
|
export const CALCULATOR_WINDOW_ID = "calculator";
|
||||||
|
export const CALCULATOR_SURFACE_ID = "window:calculator";
|
||||||
|
|
||||||
|
/** One standing maths session, shared by the window and the assistant tools. */
|
||||||
|
const coordinator = new MathCoordinator();
|
||||||
|
coordinator.setAICompletion(rewriteSpokenProblem);
|
||||||
|
|
||||||
|
const CALCULATOR_TOOLS: ToolSpec[] = [
|
||||||
|
{
|
||||||
|
name: "calculate",
|
||||||
|
description:
|
||||||
|
"Solve a maths problem stated in words or notation ('2x + 7 = 19', 'what is 15 percent of 240', " +
|
||||||
|
"'is 91 prime', 'where does 11 first appear in pi', 'area of a circle with radius 3'). " +
|
||||||
|
"Do NOT work it out yourself first — hand the words over verbatim; the calculator answers " +
|
||||||
|
"exactly and shows the result on the glasses. Follow-ups like 'graph it' and 'explain it' " +
|
||||||
|
"act on the problem already standing.",
|
||||||
|
inputSchema: {
|
||||||
|
type: "object",
|
||||||
|
properties: {
|
||||||
|
problem: { type: "string", description: "The problem or follow-up, exactly as asked." },
|
||||||
|
},
|
||||||
|
required: ["problem"],
|
||||||
|
additionalProperties: false,
|
||||||
|
},
|
||||||
|
availability: "open",
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
export function createCalculatorAppWindow(options: InProcessAppOptions): InProcessWindow {
|
||||||
|
const layer = new CalculatorLayer(coordinator, options.actions);
|
||||||
|
|
||||||
|
const menuItems = (): MenuItem[] => [
|
||||||
|
...CALCULATOR_MODES.map(
|
||||||
|
(mode): MenuItem => ({
|
||||||
|
label: `${modeLabel(mode)} it`,
|
||||||
|
onSelect: (ctx) => {
|
||||||
|
ctx.stack.pop();
|
||||||
|
layer.performFollowUp(mode);
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
{
|
||||||
|
label: "Clear",
|
||||||
|
onSelect: (ctx) => {
|
||||||
|
ctx.stack.pop();
|
||||||
|
layer.clear();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Calculator settings",
|
||||||
|
onSelect: (ctx) => {
|
||||||
|
ctx.stack.pop();
|
||||||
|
openSettingsSubMenu(ctx, "Calculator settings", [
|
||||||
|
enumSettingMenuItem(calculatorModeSetting, {
|
||||||
|
onChange: () => layer.applySettings(),
|
||||||
|
}),
|
||||||
|
enumSettingMenuItem(calculatorListeningSetting, {
|
||||||
|
onChange: () => layer.applySettings(),
|
||||||
|
}),
|
||||||
|
toggleSettingMenuItem(calculatorDegreesSetting, {
|
||||||
|
onChange: () => layer.applySettings(),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
let app: InProcessWindow;
|
||||||
|
app = createInProcessWindow({
|
||||||
|
appId: "calculator",
|
||||||
|
windowId: CALCULATOR_WINDOW_ID,
|
||||||
|
title: "Calculator",
|
||||||
|
iconLetter: "=",
|
||||||
|
icon: "calculator",
|
||||||
|
closeable: true,
|
||||||
|
menuItems,
|
||||||
|
actions: options.actions,
|
||||||
|
receiveTextInput: (text) => {
|
||||||
|
if (app.stack.receiveTextInput(text)) app.requestRender();
|
||||||
|
},
|
||||||
|
baseLayer: layer,
|
||||||
|
submitFrame: options.submitFrame,
|
||||||
|
setSurfaceVisible: (visible) => {
|
||||||
|
layer.setForeground(visible);
|
||||||
|
options.setSurfaceVisible(visible);
|
||||||
|
},
|
||||||
|
removeSurface: options.removeSurface,
|
||||||
|
onClosed: () => {
|
||||||
|
toolRegistry.removeAppTools(CALCULATOR_WINDOW_ID);
|
||||||
|
options.onClosed();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
layer.requestRender = app.requestRender;
|
||||||
|
layer.setForeground(shell.isWindowVisible(CALCULATOR_WINDOW_ID));
|
||||||
|
// Apply the persisted settings now the window exists: degrees onto the
|
||||||
|
// session, and continuous listening if the wearer left it on.
|
||||||
|
layer.applySettings();
|
||||||
|
|
||||||
|
toolRegistry.setAppTools({
|
||||||
|
windowId: CALCULATOR_WINDOW_ID,
|
||||||
|
appId: "calculator",
|
||||||
|
specs: CALCULATOR_TOOLS,
|
||||||
|
isForeground: () => shell.isWindowFocused(CALCULATOR_WINDOW_ID),
|
||||||
|
invoke: async (toolName, args) => {
|
||||||
|
if (toolName !== "calculate") {
|
||||||
|
return { ok: false, error: `Unknown calculator tool: ${toolName}` };
|
||||||
|
}
|
||||||
|
const problem = String((args as { problem?: unknown })?.problem ?? "").trim();
|
||||||
|
if (!problem) return { ok: false, error: "calculate requires a problem" };
|
||||||
|
const outcome = await coordinator.answerSpoken(problem);
|
||||||
|
app.requestRender();
|
||||||
|
if (outcome.kind === "failure") return { ok: false, error: outcome.reason };
|
||||||
|
const detail = coordinator.lastResult?.detail ?? "";
|
||||||
|
return { ok: true, content: detail || outcome.text };
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return app;
|
||||||
|
}
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
// The pure classification half of the calculator's command handling. Kept
|
||||||
|
// free of any UI import so the tests can exercise exactly the
|
||||||
|
// decisions that matter: which utterances are commands, which unprompted room
|
||||||
|
// speech is worth answering, and how the modes map onto the shared session.
|
||||||
|
|
||||||
|
import { type MathBranchMode } from "./math/coordinator";
|
||||||
|
import { parseCommand } from "./math/session";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What a freshly captured problem does the moment it lands.
|
||||||
|
*
|
||||||
|
* Three, not more, because these are the three the wearer is TOLD about —
|
||||||
|
* "Solve", "Explain", "Graph" are the spoken commands, so making them the
|
||||||
|
* selectable modes means the touchpad and the voice are steering the same
|
||||||
|
* thing rather than two parallel vocabularies. Differentiation stays
|
||||||
|
* reachable by saying it ("the derivative of…"), which is how it is actually
|
||||||
|
* asked for.
|
||||||
|
*/
|
||||||
|
export type CalculatorMode = "solve" | "explain" | "graph";
|
||||||
|
|
||||||
|
export const CALCULATOR_MODES: readonly CalculatorMode[] = ["solve", "explain", "graph"];
|
||||||
|
|
||||||
|
export function modeLabel(mode: CalculatorMode): string {
|
||||||
|
switch (mode) {
|
||||||
|
case "solve":
|
||||||
|
return "Solve";
|
||||||
|
case "explain":
|
||||||
|
return "Explain";
|
||||||
|
case "graph":
|
||||||
|
return "Graph";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function modeDetail(mode: CalculatorMode): string {
|
||||||
|
switch (mode) {
|
||||||
|
case "solve":
|
||||||
|
return "Answer it, exactly. 3/2 stays 3/2.";
|
||||||
|
case "explain":
|
||||||
|
return "Show the working step by step; scroll walks the rest.";
|
||||||
|
case "graph":
|
||||||
|
return "Plot it.";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function modeBranch(mode: CalculatorMode): MathBranchMode {
|
||||||
|
return mode;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The spoken commands that select this mode. Both the bare verb and the
|
||||||
|
* "it" form, because someone shown "Solve" says both.
|
||||||
|
*/
|
||||||
|
export function modeSpokenCommands(mode: CalculatorMode): string[] {
|
||||||
|
switch (mode) {
|
||||||
|
case "solve":
|
||||||
|
return ["solve", "solve it"];
|
||||||
|
case "explain":
|
||||||
|
return ["explain", "explain it"];
|
||||||
|
case "graph":
|
||||||
|
return ["graph", "graph it"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How the Calculator listens.
|
||||||
|
*
|
||||||
|
* "Tap to talk" arms exactly one finalized utterance per tap, so the app is
|
||||||
|
* not standing in the room claiming every sentence; "continuous" listens the
|
||||||
|
* whole time the app is foreground, gated by the looks-like-maths test
|
||||||
|
* below. The reason there are two input modes: a wearer in a
|
||||||
|
* quiet room must be able to take the microphone away from the calculator.
|
||||||
|
*/
|
||||||
|
export type CalculatorListening = "tap" | "continuous";
|
||||||
|
|
||||||
|
export function listeningLabel(listening: CalculatorListening): string {
|
||||||
|
switch (listening) {
|
||||||
|
case "tap":
|
||||||
|
return "Tap to talk";
|
||||||
|
case "continuous":
|
||||||
|
return "Continuous";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recognise a bare mode command in an utterance. Exact match on the whole
|
||||||
|
* utterance, not a substring: "I need to solve this problem with the tax
|
||||||
|
* people" is conversation, and a substring test turns it into a command.
|
||||||
|
*/
|
||||||
|
export function modeCommand(text: string): CalculatorMode | null {
|
||||||
|
const normalized = text.toLowerCase().replace(/^[ .,!?"']+|[ .,!?"']+$/g, "");
|
||||||
|
for (const mode of CALCULATOR_MODES) {
|
||||||
|
if (modeSpokenCommands(mode).includes(normalized)) return mode;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isDictationCancellation(text: string): boolean {
|
||||||
|
const normalized = text.toLowerCase().replace(/^[ .,!?"']+|[ .,!?"']+$/g, "");
|
||||||
|
return ["cancel", "cancel listening", "stop listening", "never mind", "nevermind"].includes(normalized);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether unprompted room speech is worth handing to the parser. In
|
||||||
|
* continuous mode the app sees every finalized utterance in the room;
|
||||||
|
* without this gate, every sentence becomes a failed calculation on the
|
||||||
|
* lens.
|
||||||
|
*/
|
||||||
|
export function isWorthAnswering(text: string): boolean {
|
||||||
|
if (modeCommand(text) !== null) return true;
|
||||||
|
return parseCommand(text) !== null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function cycleMode(mode: CalculatorMode, forward: boolean): CalculatorMode {
|
||||||
|
const index = CALCULATOR_MODES.indexOf(mode);
|
||||||
|
const step = forward ? 1 : CALCULATOR_MODES.length - 1;
|
||||||
|
return CALCULATOR_MODES[(index + step) % CALCULATOR_MODES.length]!;
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
// Draws the maths engine's already-sampled graph into the app's GrayImage viewport.
|
||||||
|
// The renderer never re-evaluates the expression: segment breaks, viewport
|
||||||
|
// clipping, roots, and extrema therefore stay exactly what the plotter
|
||||||
|
// decided, and an asymptote correctly stays an open gap rather than a
|
||||||
|
// vertical line — the single most recognisable "bad graphing app" artefact.
|
||||||
|
|
||||||
|
import { GrayImage } from "../../graphics/image";
|
||||||
|
import { type Graph, type GraphPoint, viewportContainsY } from "./math/plotter";
|
||||||
|
|
||||||
|
// Brightness levels tuned for the G2's grayscale panel: the curve stays
|
||||||
|
// visually dominant over the axes, and the axes over the tick grid.
|
||||||
|
const GRID_VALUE = 38;
|
||||||
|
const AXIS_VALUE = 150;
|
||||||
|
const BORDER_VALUE = 105;
|
||||||
|
const CURVE_VALUES = [245, 200, 160];
|
||||||
|
const MARKER_VALUE = 255;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draw the graph into `rect` (x, y, width, height) of the image. The caller
|
||||||
|
* owns the header and footer rows.
|
||||||
|
*/
|
||||||
|
export function drawGraph(
|
||||||
|
image: GrayImage,
|
||||||
|
graph: Graph,
|
||||||
|
rect: { x: number; y: number; width: number; height: number },
|
||||||
|
): void {
|
||||||
|
if (rect.width <= 1 || rect.height <= 1) return;
|
||||||
|
const viewport = graph.viewport;
|
||||||
|
const spanX = Math.max(viewport.xMax - viewport.xMin, Number.EPSILON);
|
||||||
|
const spanY = Math.max(viewport.yMax - viewport.yMin, Number.EPSILON);
|
||||||
|
|
||||||
|
const px = (x: number): number => rect.x + ((x - viewport.xMin) / spanX) * rect.width;
|
||||||
|
const py = (y: number): number => rect.y + rect.height - ((y - viewport.yMin) / spanY) * rect.height;
|
||||||
|
|
||||||
|
const clampX = (x: number): number => Math.max(rect.x, Math.min(rect.x + rect.width - 1, x));
|
||||||
|
const clampY = (y: number): number => Math.max(rect.y, Math.min(rect.y + rect.height - 1, y));
|
||||||
|
|
||||||
|
// Tick grid first so the curve and axes draw over it.
|
||||||
|
for (const tick of graph.xAxis.ticks) {
|
||||||
|
if (tick < viewport.xMin || tick > viewport.xMax) continue;
|
||||||
|
const x = Math.round(px(tick));
|
||||||
|
image.drawLine(x, rect.y, x, rect.y + rect.height - 1, GRID_VALUE);
|
||||||
|
}
|
||||||
|
for (const tick of graph.yAxis.ticks) {
|
||||||
|
if (tick < viewport.yMin || tick > viewport.yMax) continue;
|
||||||
|
const y = Math.round(py(tick));
|
||||||
|
image.drawLine(rect.x, y, rect.x + rect.width - 1, y, GRID_VALUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Axes.
|
||||||
|
if (viewport.yMin <= 0 && viewport.yMax >= 0) {
|
||||||
|
const y = Math.round(py(0));
|
||||||
|
image.drawLine(rect.x, y, rect.x + rect.width - 1, y, AXIS_VALUE);
|
||||||
|
}
|
||||||
|
if (viewport.xMin <= 0 && viewport.xMax >= 0) {
|
||||||
|
const x = Math.round(px(0));
|
||||||
|
image.drawLine(x, rect.y, x, rect.y + rect.height - 1, AXIS_VALUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Curves, brightest first plot.
|
||||||
|
for (let plotIndex = 0; plotIndex < graph.plots.length; plotIndex++) {
|
||||||
|
const plot = graph.plots[plotIndex]!;
|
||||||
|
const value = CURVE_VALUES[plotIndex % CURVE_VALUES.length]!;
|
||||||
|
for (const segment of plot.segments) {
|
||||||
|
let previous: GraphPoint | null = null;
|
||||||
|
for (const point of segment.points) {
|
||||||
|
if (!Number.isFinite(point.x) || !Number.isFinite(point.y)) {
|
||||||
|
previous = null;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (previous) {
|
||||||
|
image.drawLine(
|
||||||
|
Math.round(clampX(px(previous.x))),
|
||||||
|
Math.round(clampY(py(previous.y))),
|
||||||
|
Math.round(clampX(px(point.x))),
|
||||||
|
Math.round(clampY(py(point.y))),
|
||||||
|
value,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
previous = point;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Markers: roots and intercepts as small filled dots.
|
||||||
|
for (const marker of plot.markers) {
|
||||||
|
if (!viewportContainsY(viewport, marker.point.y)) continue;
|
||||||
|
if (marker.point.x < viewport.xMin || marker.point.x > viewport.xMax) continue;
|
||||||
|
const cx = Math.round(px(marker.point.x));
|
||||||
|
const cy = Math.round(py(marker.point.y));
|
||||||
|
image.fillRoundedRect(cx - 3, cy - 3, 6, 6, MARKER_VALUE, 3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Frame the plot area.
|
||||||
|
image.drawRect(rect.x, rect.y, rect.width, rect.height, BORDER_VALUE);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
/**
|
||||||
|
* One-shot completion against the assistant's configured model, used by the
|
||||||
|
* Calculator's optional rewrite fallback (see MathCoordinator.answerSpoken:
|
||||||
|
* the deterministic parser runs first; the model only ever translates words
|
||||||
|
* into notation). Resolves to null when no provider is configured or the
|
||||||
|
* call fails — the calculator then reports "could not read that" instead of
|
||||||
|
* surfacing a transport error.
|
||||||
|
*/
|
||||||
|
import { streamAnthropicMessage } from "../../native/anthropic";
|
||||||
|
import { streamLocalQwen } from "../../native/llama";
|
||||||
|
import { streamOpenAiResponse } from "../../native/openai";
|
||||||
|
import { resolveAssistantModel } from "../../assistant/models";
|
||||||
|
import { type LlmStreamOptions } from "../../assistant/llm-protocol";
|
||||||
|
import {
|
||||||
|
anthropicApiKeySetting,
|
||||||
|
assistantModelSetting,
|
||||||
|
openAiApiKeySetting,
|
||||||
|
} from "../../ui/dashboard-settings";
|
||||||
|
import { CALCULATOR_REWRITE_SYSTEM_PROMPT, buildCalculatorRewriteUserMessage } from "../../prompts";
|
||||||
|
|
||||||
|
export function rewriteSpokenProblem(spoken: string): Promise<string | null> {
|
||||||
|
const resolved = resolveAssistantModel(assistantModelSetting.get(), {
|
||||||
|
anthropic: anthropicApiKeySetting.get(),
|
||||||
|
openai: openAiApiKeySetting.get(),
|
||||||
|
});
|
||||||
|
if (!resolved) return Promise.resolve(null);
|
||||||
|
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
const options: LlmStreamOptions = {
|
||||||
|
apiKey: resolved.apiKey,
|
||||||
|
model: resolved.model,
|
||||||
|
system: CALCULATOR_REWRITE_SYSTEM_PROMPT,
|
||||||
|
effort: "low",
|
||||||
|
maxTokens: 200,
|
||||||
|
messages: [{ role: "user", content: buildCalculatorRewriteUserMessage(spoken) }],
|
||||||
|
onDone: (result) => resolve(result.text ?? null),
|
||||||
|
onError: () => resolve(null),
|
||||||
|
};
|
||||||
|
switch (resolved.provider) {
|
||||||
|
case "openai":
|
||||||
|
streamOpenAiResponse(options);
|
||||||
|
break;
|
||||||
|
case "local":
|
||||||
|
streamLocalQwen(options);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
streamAnthropicMessage(options);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,591 @@
|
|||||||
|
// The calculator app layer for FaceClaw: a spoken (or typed) problem in, an
|
||||||
|
// exact answer on the lens.
|
||||||
|
//
|
||||||
|
// Deliberately thin. Everything mathematical belongs to math/ and everything
|
||||||
|
// about the standing problem, follow-ups, and long runs belongs to
|
||||||
|
// MathCoordinator. This layer owns only what is genuinely the app's: which
|
||||||
|
// mode a fresh capture lands in, what the viewport shows, and how the
|
||||||
|
// touchpad and the microphone are shared.
|
||||||
|
|
||||||
|
import { GrayImage, type UiFont } from "../../graphics/image";
|
||||||
|
import { getDefaultLargeFont, getDefaultMediumFont, getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
|
import { wrapText, truncateText } from "../../graphics/textwrap";
|
||||||
|
import { lineStep } from "../../ui/metrics";
|
||||||
|
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, GESTURE_SCROLL, gestureHints, type InputEvent } from "../../ui/gestures";
|
||||||
|
import { type Layer, type LayerActions, type LayerContext } from "../../ui/layers";
|
||||||
|
import { ConfigSettingBoolean, ConfigSettingEnum } from "../../ui/dashboard-settings";
|
||||||
|
import { shell } from "../../ui/shell/shell";
|
||||||
|
import { voiceControlBridge, type VoiceTranscriptEvent } from "../../native/voice-control";
|
||||||
|
import { type MathBranchOutcome, MathCoordinator } from "./math/coordinator";
|
||||||
|
import { type LongRunOffer, type LongRunProgress, offerGlassesPrompt, progressText } from "./math/workload";
|
||||||
|
import { plain } from "./math/text-renderer";
|
||||||
|
import { drawGraph } from "./calculator-graph";
|
||||||
|
import { type CalculatorListening, type CalculatorMode, CALCULATOR_MODES, cycleMode, isDictationCancellation, isWorthAnswering, listeningLabel, modeCommand, modeLabel } from "./calculator-commands";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Settings
|
||||||
|
|
||||||
|
/** The mode a fresh capture lands in. Also what scrolling cycles. */
|
||||||
|
export const calculatorModeSetting = new ConfigSettingEnum<CalculatorMode>({
|
||||||
|
id: "calculator-mode",
|
||||||
|
label: "Default mode",
|
||||||
|
storageKey: "calculator.defaultMode",
|
||||||
|
defaultValue: "solve",
|
||||||
|
values: [...CALCULATOR_MODES],
|
||||||
|
formatValue: modeLabel,
|
||||||
|
description:
|
||||||
|
"What a freshly stated problem does. On the glasses, scroll applies another mode — or walks Explain steps — and tap toggles the mic.",
|
||||||
|
});
|
||||||
|
|
||||||
|
export const calculatorListeningSetting = new ConfigSettingEnum<CalculatorListening>({
|
||||||
|
id: "calculator-listening",
|
||||||
|
label: "Listening",
|
||||||
|
storageKey: "calculator.listening",
|
||||||
|
defaultValue: "tap",
|
||||||
|
values: ["tap", "continuous"],
|
||||||
|
formatValue: listeningLabel,
|
||||||
|
description:
|
||||||
|
"Tap to talk captures one problem per tap. Continuous listens the whole time the calculator is in front, answering anything that sounds like maths.",
|
||||||
|
});
|
||||||
|
|
||||||
|
export const calculatorDegreesSetting = new ConfigSettingBoolean({
|
||||||
|
id: "calculator-degrees",
|
||||||
|
label: "Trigonometry in degrees",
|
||||||
|
storageKey: "calculator.usesDegrees",
|
||||||
|
defaultValue: false,
|
||||||
|
description: "Evaluate sin/cos/tan in degrees instead of radians.",
|
||||||
|
});
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Layer
|
||||||
|
|
||||||
|
export class CalculatorLayer implements Layer {
|
||||||
|
/** Rebound by the window factory once the window exists. */
|
||||||
|
requestRender: () => void = () => {};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The last thing said to the calculator, so the view can show what it
|
||||||
|
* heard next to what it made of it — the only way a wearer can tell a
|
||||||
|
* mis-heard problem from a wrong answer.
|
||||||
|
*/
|
||||||
|
private lastInput = "";
|
||||||
|
private lastAnswer = "";
|
||||||
|
private lastFailure: string | null = null;
|
||||||
|
private working = false;
|
||||||
|
/** True while one finalized utterance is armed for capture. */
|
||||||
|
private dictating = false;
|
||||||
|
private foreground = true;
|
||||||
|
private continuousActive = false;
|
||||||
|
private unsubscribeTranscript: (() => void) | null = null;
|
||||||
|
private lastDeepAnswer: MathBranchOutcome | null = null;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly coordinator: MathCoordinator,
|
||||||
|
private readonly actions: LayerActions,
|
||||||
|
) {
|
||||||
|
this.coordinator.setUsesDegrees(calculatorDegreesSetting.get());
|
||||||
|
this.coordinator.onChanged = () => this.handleCoordinatorChanged();
|
||||||
|
this.unsubscribeTranscript = voiceControlBridge.onTranscript((event) => this.onTranscript(event));
|
||||||
|
}
|
||||||
|
|
||||||
|
private get mode(): CalculatorMode {
|
||||||
|
return calculatorModeSetting.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
private get listening(): CalculatorListening {
|
||||||
|
return calculatorListeningSetting.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Lifecycle
|
||||||
|
|
||||||
|
onRemoved(): void {
|
||||||
|
this.stopListening();
|
||||||
|
this.unsubscribeTranscript?.();
|
||||||
|
this.unsubscribeTranscript = null;
|
||||||
|
this.coordinator.onChanged = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Foreground/background transitions, forwarded by the window factory. */
|
||||||
|
setForeground(foreground: boolean): void {
|
||||||
|
if (this.foreground === foreground) return;
|
||||||
|
this.foreground = foreground;
|
||||||
|
if (!foreground) {
|
||||||
|
this.stopListening();
|
||||||
|
} else {
|
||||||
|
this.refreshListening();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Apply a settings change: degrees and the listening mode both act immediately. */
|
||||||
|
applySettings(): void {
|
||||||
|
this.coordinator.setUsesDegrees(calculatorDegreesSetting.get());
|
||||||
|
this.refreshListening();
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
private refreshListening(): void {
|
||||||
|
if (!this.foreground) return;
|
||||||
|
if (this.listening === "continuous") {
|
||||||
|
if (!this.continuousActive) {
|
||||||
|
this.continuousActive = true;
|
||||||
|
void this.actions.startContinuousVoiceCapture();
|
||||||
|
}
|
||||||
|
} else if (this.continuousActive) {
|
||||||
|
this.continuousActive = false;
|
||||||
|
void this.actions.stopContinuousVoiceCapture();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private stopListening(): void {
|
||||||
|
if (this.dictating) {
|
||||||
|
this.dictating = false;
|
||||||
|
void this.actions.stopVoiceCapture();
|
||||||
|
}
|
||||||
|
if (this.continuousActive) {
|
||||||
|
this.continuousActive = false;
|
||||||
|
void this.actions.stopContinuousVoiceCapture();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Asking
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put a problem (or a follow-up command) to the calculator.
|
||||||
|
*
|
||||||
|
* Command first, problem second. "graph it" contains no operator and would
|
||||||
|
* fail as an expression, and a wearer who says it expects the plot of what
|
||||||
|
* is already on the lens rather than an error about the word "it".
|
||||||
|
*/
|
||||||
|
submit(text: string): void {
|
||||||
|
const trimmed = text.trim();
|
||||||
|
if (!trimmed) return;
|
||||||
|
this.lastInput = trimmed;
|
||||||
|
this.lastFailure = null;
|
||||||
|
|
||||||
|
const selected = modeCommand(trimmed);
|
||||||
|
if (selected) {
|
||||||
|
this.performFollowUp(selected);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = this.mode;
|
||||||
|
this.working = true;
|
||||||
|
this.requestRender();
|
||||||
|
void this.coordinator.answerSpoken(trimmed).then((outcome) => {
|
||||||
|
// A fresh problem lands in the app's mode: solving is the default, but
|
||||||
|
// a wearer whose default is "graph" said the problem in order to see it
|
||||||
|
// plotted, not to read its root.
|
||||||
|
if (outcome.kind === "value" && target !== "solve") {
|
||||||
|
outcome = this.coordinator.run(target, "");
|
||||||
|
}
|
||||||
|
this.working = false;
|
||||||
|
this.applyOutcome(outcome);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Re-run the standing problem through a different presentation branch.
|
||||||
|
* This is the one action used by scroll cycling, spoken "… it" commands,
|
||||||
|
* and the window menu, so changing mode can never mean "change a setting
|
||||||
|
* but leave the old answer up".
|
||||||
|
*/
|
||||||
|
performFollowUp(selected: CalculatorMode): void {
|
||||||
|
calculatorModeSetting.set(selected);
|
||||||
|
if (!this.coordinator.hasProblem) {
|
||||||
|
this.lastFailure = "No problem yet";
|
||||||
|
this.requestRender();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.working = false;
|
||||||
|
this.lastFailure = null;
|
||||||
|
this.applyOutcome(this.coordinator.run(selected, ""));
|
||||||
|
}
|
||||||
|
|
||||||
|
clear(): void {
|
||||||
|
this.working = false;
|
||||||
|
this.lastInput = "";
|
||||||
|
this.lastAnswer = "";
|
||||||
|
this.lastFailure = null;
|
||||||
|
this.coordinator.handleRingAction("exit");
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
private applyOutcome(outcome: MathBranchOutcome | null): void {
|
||||||
|
if (outcome?.kind === "value") {
|
||||||
|
this.lastAnswer = outcome.text;
|
||||||
|
this.lastFailure = null;
|
||||||
|
} else if (outcome?.kind === "failure") {
|
||||||
|
this.lastFailure = outcome.reason;
|
||||||
|
}
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
private handleCoordinatorChanged(): void {
|
||||||
|
// The answer a deeper pass produced arrives on its own channel; fold it
|
||||||
|
// into the standing answer the moment it lands.
|
||||||
|
const deep = this.coordinator.deepAnswer;
|
||||||
|
if (deep && deep !== this.lastDeepAnswer) {
|
||||||
|
this.lastDeepAnswer = deep;
|
||||||
|
this.applyOutcome(deep);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Dictation
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Arm exactly one finalized utterance. One, not a listening window: the
|
||||||
|
* indicator on the lens is what makes this honest, and a calculator that
|
||||||
|
* quietly held the microphone open would be indistinguishable from one
|
||||||
|
* that did not.
|
||||||
|
*/
|
||||||
|
beginDictation(): void {
|
||||||
|
if (this.dictating) return;
|
||||||
|
this.dictating = true;
|
||||||
|
void this.actions.startVoiceCapture(true);
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelDictation(): void {
|
||||||
|
if (!this.dictating) return;
|
||||||
|
this.dictating = false;
|
||||||
|
void this.actions.stopVoiceCapture();
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A finalized utterance reached the app.
|
||||||
|
*
|
||||||
|
* In tap mode this only ever arrives because the wearer armed it, so it is
|
||||||
|
* always taken. In continuous mode it also arrives from ordinary room
|
||||||
|
* speech, and there it has to clear the looks-like-maths gate first —
|
||||||
|
* otherwise every sentence in the room becomes a failed calculation on the
|
||||||
|
* lens.
|
||||||
|
*/
|
||||||
|
private onTranscript(event: VoiceTranscriptEvent): void {
|
||||||
|
if (!event.isFinal) return;
|
||||||
|
const text = event.text.trim();
|
||||||
|
if (!text) return;
|
||||||
|
const armed = this.dictating;
|
||||||
|
const continuous = this.continuousActive && this.foreground;
|
||||||
|
if (!armed && !continuous) return;
|
||||||
|
if (armed) {
|
||||||
|
this.dictating = false;
|
||||||
|
void this.actions.stopVoiceCapture();
|
||||||
|
}
|
||||||
|
// A standing offer or a run in flight owns the next yes/no said in the
|
||||||
|
// room ("keep going", "never mind", "stop").
|
||||||
|
const longRunAnswer = this.coordinator.handleLongRunUtterance(text);
|
||||||
|
if (longRunAnswer) {
|
||||||
|
this.applyOutcome(longRunAnswer);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (armed && isDictationCancellation(text)) {
|
||||||
|
this.requestRender();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!armed && !isWorthAnswering(text)) return;
|
||||||
|
this.submit(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Input
|
||||||
|
|
||||||
|
receiveTextInput(text: string): void {
|
||||||
|
this.submit(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
handleInput(event: InputEvent, _ctx: LayerContext): void {
|
||||||
|
switch (event.type) {
|
||||||
|
case "scroll-up":
|
||||||
|
case "scroll-down": {
|
||||||
|
const forward = event.type === "scroll-down";
|
||||||
|
// While Explain is showing a step sequence the scroll walks it — the
|
||||||
|
// coordinator owns that, and asking it first is what keeps one
|
||||||
|
// gesture from meaning two things at once. Otherwise scroll cycles
|
||||||
|
// the MODE, because the mode is what the wearer changes between
|
||||||
|
// problems and the steps only exist inside one of the three modes.
|
||||||
|
if (this.mode === "explain" && this.coordinator.stepPosition !== null) {
|
||||||
|
this.applyOutcome(this.coordinator.handleRingAction(forward ? "forward" : "back"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const next = cycleMode(this.mode, forward);
|
||||||
|
if (this.coordinator.hasProblem) {
|
||||||
|
this.performFollowUp(next);
|
||||||
|
} else {
|
||||||
|
calculatorModeSetting.set(next);
|
||||||
|
this.requestRender();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "click": {
|
||||||
|
// A standing offer owns the tap: accept and start the long run.
|
||||||
|
if (this.coordinator.hasLongRunInteraction) {
|
||||||
|
this.applyOutcome(this.coordinator.handleRingAction("commit"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.dictating) {
|
||||||
|
this.cancelDictation();
|
||||||
|
} else {
|
||||||
|
this.beginDictation();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "double-click": {
|
||||||
|
if (this.dictating) {
|
||||||
|
this.cancelDictation();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (this.coordinator.isRunningLong || this.coordinator.pendingLongRun) {
|
||||||
|
// Stop the run, or turn the offer down; the shallow answer stands.
|
||||||
|
this.applyOutcome(this.coordinator.handleRingAction("exit"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// The standard leave-the-app gesture.
|
||||||
|
shell.yieldFocusToSidebar();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Paint
|
||||||
|
|
||||||
|
paint(ctx: LayerContext): GrayImage {
|
||||||
|
const { width, height } = ctx.stack.getBaseSize();
|
||||||
|
const image = new GrayImage(width, height, 0);
|
||||||
|
const small = getDefaultSmallFont();
|
||||||
|
|
||||||
|
this.paintTabs(image, small, width);
|
||||||
|
|
||||||
|
const footerY = height - small.lineHeight - 6;
|
||||||
|
const bodyTop = 46;
|
||||||
|
let bodyBottom = footerY - 4;
|
||||||
|
|
||||||
|
// A standing offer or a running deep pass takes the rows just above the
|
||||||
|
// footer, whatever view is behind it.
|
||||||
|
const offer = this.coordinator.pendingLongRun;
|
||||||
|
const progress = this.coordinator.longRunProgress;
|
||||||
|
if (offer || progress) {
|
||||||
|
bodyBottom = this.paintLongRunPanel(image, small, width, bodyBottom, offer, progress);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.working) {
|
||||||
|
this.drawCentered(image, small, Math.round((bodyTop + bodyBottom) / 2) - 8, "Working…", 180);
|
||||||
|
} else if (this.lastFailure !== null) {
|
||||||
|
this.paintFailure(image, small, width, bodyTop, bodyBottom);
|
||||||
|
} else if (this.mode === "explain" && this.coordinator.stepPosition !== null) {
|
||||||
|
this.paintExplain(image, width, bodyTop, bodyBottom);
|
||||||
|
} else if (this.mode === "graph" && this.coordinator.lastGraph) {
|
||||||
|
this.paintGraph(image, small, width, bodyTop, bodyBottom);
|
||||||
|
} else if (this.lastAnswer) {
|
||||||
|
this.paintAnswer(image, width, bodyTop, bodyBottom);
|
||||||
|
} else {
|
||||||
|
this.paintEmpty(image, small, width, bodyTop, bodyBottom);
|
||||||
|
}
|
||||||
|
|
||||||
|
image.drawText(small, 24, footerY, this.footerHints(), 110);
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The three modes as tabs, plus the deg/listening status chips. */
|
||||||
|
private paintTabs(image: GrayImage, font: UiFont, width: number): void {
|
||||||
|
let x = 24;
|
||||||
|
for (const mode of CALCULATOR_MODES) {
|
||||||
|
const label = modeLabel(mode);
|
||||||
|
const active = mode === this.mode;
|
||||||
|
image.drawText(font, x, 15, label, active ? 245 : 105);
|
||||||
|
image.drawLine(x, 35, x + font.measureText(label), 35, active ? 200 : 30);
|
||||||
|
x += font.measureText(label) + 18;
|
||||||
|
}
|
||||||
|
|
||||||
|
const chips: string[] = [];
|
||||||
|
if (calculatorDegreesSetting.get()) chips.push("deg");
|
||||||
|
if (this.dictating) chips.push("listening…");
|
||||||
|
else if (this.continuousActive && this.foreground) chips.push("mic on");
|
||||||
|
if (chips.length > 0) {
|
||||||
|
const text = chips.join(" · ");
|
||||||
|
image.drawText(font, width - 24 - font.measureText(text), 15, text, this.dictating ? 220 : 110);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private paintFailure(
|
||||||
|
image: GrayImage,
|
||||||
|
font: UiFont,
|
||||||
|
width: number,
|
||||||
|
bodyTop: number,
|
||||||
|
bodyBottom: number,
|
||||||
|
): void {
|
||||||
|
this.paintHeardLine(image, font, width, bodyTop);
|
||||||
|
const top = this.lastInput ? bodyTop + lineStep(font) + 6 : bodyTop + 8;
|
||||||
|
const lines = wrapText(font, this.lastFailure ?? "", width - 64);
|
||||||
|
const step = lineStep(font);
|
||||||
|
const maxLines = Math.max(1, Math.floor((bodyBottom - top) / step));
|
||||||
|
for (let index = 0; index < Math.min(lines.length, maxLines); index++) {
|
||||||
|
image.drawText(font, 32, top + index * step, lines[index]!, 200);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private paintExplain(image: GrayImage, width: number, bodyTop: number, bodyBottom: number): void {
|
||||||
|
const small = getDefaultSmallFont();
|
||||||
|
const medium = getDefaultMediumFont();
|
||||||
|
const position = this.coordinator.stepPosition;
|
||||||
|
const steps = this.coordinator.explanationSteps;
|
||||||
|
const step = position ? steps[position.index] : undefined;
|
||||||
|
if (!position || !step) return;
|
||||||
|
|
||||||
|
let y = bodyTop + 2;
|
||||||
|
image.drawText(small, 24, y, `Step ${position.index + 1} of ${position.total}`, 130);
|
||||||
|
y += lineStep(small) + 2;
|
||||||
|
image.drawText(medium, 24, y, truncateText(medium, step.title, width - 48), 245);
|
||||||
|
y += lineStep(medium) + 2;
|
||||||
|
image.drawText(medium, 24, y, truncateText(medium, plain(step.expression), width - 48), 220);
|
||||||
|
y += lineStep(medium) + 6;
|
||||||
|
|
||||||
|
const detailLines = wrapText(small, step.detail, width - 64);
|
||||||
|
const stepPitch = lineStep(small);
|
||||||
|
const maxLines = Math.max(0, Math.floor((bodyBottom - y) / stepPitch));
|
||||||
|
for (let index = 0; index < Math.min(detailLines.length, maxLines); index++) {
|
||||||
|
image.drawText(small, 32, y + index * stepPitch, detailLines[index]!, 150);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private paintGraph(
|
||||||
|
image: GrayImage,
|
||||||
|
font: UiFont,
|
||||||
|
width: number,
|
||||||
|
bodyTop: number,
|
||||||
|
bodyBottom: number,
|
||||||
|
): void {
|
||||||
|
const graph = this.coordinator.lastGraph;
|
||||||
|
if (!graph) return;
|
||||||
|
const headline = this.lastAnswer.split("\n")[0] ?? "";
|
||||||
|
image.drawText(font, 24, bodyTop, truncateText(font, headline, width - 48), 200);
|
||||||
|
const plotTop = bodyTop + lineStep(font) + 4;
|
||||||
|
drawGraph(image, graph, {
|
||||||
|
x: 18,
|
||||||
|
y: plotTop,
|
||||||
|
width: width - 36,
|
||||||
|
height: Math.max(2, bodyBottom - plotTop),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private paintAnswer(image: GrayImage, width: number, bodyTop: number, bodyBottom: number): void {
|
||||||
|
const small = getDefaultSmallFont();
|
||||||
|
this.paintHeardLine(image, small, width, bodyTop);
|
||||||
|
const top = this.lastInput ? bodyTop + lineStep(small) + 4 : bodyTop;
|
||||||
|
|
||||||
|
// A short single-line answer earns the large font; anything longer drops
|
||||||
|
// to the medium font and wraps.
|
||||||
|
const lines = this.lastAnswer.split("\n");
|
||||||
|
const large = getDefaultLargeFont();
|
||||||
|
if (lines.length === 1 && large.measureText(lines[0]!) <= width - 64) {
|
||||||
|
const y = Math.round((top + bodyBottom - large.lineHeight) / 2);
|
||||||
|
this.drawCentered(image, large, y, lines[0]!, 245);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const medium = getDefaultMediumFont();
|
||||||
|
const wrapped = lines.flatMap((line) => wrapText(medium, line, width - 64));
|
||||||
|
const step = lineStep(medium);
|
||||||
|
const maxLines = Math.max(1, Math.floor((bodyBottom - top) / step));
|
||||||
|
const shown = wrapped.slice(0, maxLines);
|
||||||
|
let y = Math.max(top, Math.round((top + bodyBottom - shown.length * step) / 2));
|
||||||
|
for (const line of shown) {
|
||||||
|
this.drawCentered(image, medium, y, line, 235);
|
||||||
|
y += step;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private paintEmpty(
|
||||||
|
image: GrayImage,
|
||||||
|
font: UiFont,
|
||||||
|
width: number,
|
||||||
|
bodyTop: number,
|
||||||
|
bodyBottom: number,
|
||||||
|
): void {
|
||||||
|
const prompt =
|
||||||
|
this.listening === "continuous"
|
||||||
|
? `Say a problem, then "${modeLabel(this.mode).toLowerCase()} it"`
|
||||||
|
: "Tap to say a problem — or use Voice input to type one";
|
||||||
|
const lines = wrapText(font, prompt, width - 96);
|
||||||
|
const step = lineStep(font);
|
||||||
|
let y = Math.round((bodyTop + bodyBottom - lines.length * step) / 2);
|
||||||
|
for (const line of lines) {
|
||||||
|
this.drawCentered(image, font, y, line, 150);
|
||||||
|
y += step;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private paintHeardLine(image: GrayImage, font: UiFont, width: number, y: number): void {
|
||||||
|
if (!this.lastInput) return;
|
||||||
|
const label = "Heard";
|
||||||
|
image.drawText(font, 24, y, label, 110);
|
||||||
|
const x = 24 + font.measureText(label) + 10;
|
||||||
|
image.drawText(font, x, y, truncateText(font, this.lastInput, width - x - 24), 160);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The standing offer, or the live progress of an accepted run, in the two
|
||||||
|
* rows above the footer. Returns the new body bottom.
|
||||||
|
*/
|
||||||
|
private paintLongRunPanel(
|
||||||
|
image: GrayImage,
|
||||||
|
font: UiFont,
|
||||||
|
width: number,
|
||||||
|
bodyBottom: number,
|
||||||
|
offer: LongRunOffer | null,
|
||||||
|
progress: LongRunProgress | null,
|
||||||
|
): number {
|
||||||
|
const step = lineStep(font);
|
||||||
|
const lines = progress
|
||||||
|
? [`${progressText(progress)} · ${Math.round(progress.elapsedSeconds)}s`]
|
||||||
|
: offer
|
||||||
|
? offerGlassesPrompt(offer).split("\n")
|
||||||
|
: [];
|
||||||
|
const panelTop = bodyBottom - lines.length * step - 6;
|
||||||
|
image.drawLine(16, panelTop, width - 16, panelTop, 40);
|
||||||
|
for (let index = 0; index < lines.length; index++) {
|
||||||
|
image.drawText(font, 24, panelTop + 4 + index * step, truncateText(font, lines[index]!, width - 48), 190);
|
||||||
|
}
|
||||||
|
return panelTop - 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
private footerHints(): string {
|
||||||
|
if (this.coordinator.longRunProgress) {
|
||||||
|
return gestureHints([[GESTURE_DOUBLE_CLICK, "stop"]]);
|
||||||
|
}
|
||||||
|
if (this.coordinator.pendingLongRun) {
|
||||||
|
return gestureHints([
|
||||||
|
[GESTURE_CLICK, "keep going"],
|
||||||
|
[GESTURE_DOUBLE_CLICK, "leave it"],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
if (this.dictating) {
|
||||||
|
return gestureHints([
|
||||||
|
[GESTURE_CLICK, "cancel mic"],
|
||||||
|
[GESTURE_DOUBLE_CLICK, "cancel"],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
const scrollTarget =
|
||||||
|
this.mode === "explain" && this.coordinator.stepPosition !== null ? "steps" : "mode";
|
||||||
|
return gestureHints([
|
||||||
|
[GESTURE_SCROLL, scrollTarget],
|
||||||
|
[GESTURE_CLICK, "mic"],
|
||||||
|
[GESTURE_DOUBLE_CLICK, "back"],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private drawCentered(image: GrayImage, font: UiFont, y: number, text: string, value: number): void {
|
||||||
|
const x = Math.max(0, Math.round((image.width - font.measureText(text)) / 2));
|
||||||
|
image.drawText(font, x, y, text, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import { type AppDefinition } from "../app-definition";
|
||||||
|
import {
|
||||||
|
CALCULATOR_SURFACE_ID,
|
||||||
|
CALCULATOR_WINDOW_ID,
|
||||||
|
createCalculatorAppWindow,
|
||||||
|
} from "./calculator-app";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A spoken (or typed) problem in, an exact answer on the lens — with
|
||||||
|
* step-by-step explanations, graphs, and the advanced spoken-question
|
||||||
|
* topics (primality, integrals, digit searches in π, geometry).
|
||||||
|
*/
|
||||||
|
const calculatorApp: AppDefinition = {
|
||||||
|
appId: "calculator",
|
||||||
|
title: "Calculator",
|
||||||
|
icon: "calculator",
|
||||||
|
launch: (ctx) => ctx.launchInProcessApp(CALCULATOR_WINDOW_ID, CALCULATOR_SURFACE_ID, createCalculatorAppWindow),
|
||||||
|
};
|
||||||
|
|
||||||
|
export default calculatorApp;
|
||||||
@@ -0,0 +1,796 @@
|
|||||||
|
// Routes a spoken question to the right advanced-maths topic. Separate from
|
||||||
|
// the command parser because these questions have a different shape: a
|
||||||
|
// command is about an EXPRESSION and what to do with it, whereas "is 91
|
||||||
|
// prime", "factor 360", "area of a circle with radius 3" name a topic and
|
||||||
|
// carry their own arguments. Trying to force both through one parser made
|
||||||
|
// the expression grammar swallow phrases it had no business touching.
|
||||||
|
|
||||||
|
import { type MathExpression, variablesOf } from "./expression";
|
||||||
|
import { parseSpoken } from "./parser";
|
||||||
|
import { applyNumberWords } from "./normalizer";
|
||||||
|
import { plain } from "./text-renderer";
|
||||||
|
import { describeNumber, formatInt, fromDecimal } from "./math-number";
|
||||||
|
import {
|
||||||
|
type MathConstantName,
|
||||||
|
MAXIMUM_COMPUTED_DIGITS,
|
||||||
|
constantDisplayName,
|
||||||
|
constantNamed,
|
||||||
|
constantSpokenName,
|
||||||
|
} from "./constant-digits";
|
||||||
|
import {
|
||||||
|
countDigits as countDigitsIn,
|
||||||
|
digitsAt,
|
||||||
|
expectedFirstPosition,
|
||||||
|
findDigits,
|
||||||
|
highlightedMatch,
|
||||||
|
} from "./digit-search";
|
||||||
|
import { type MathWorkload, longRunOffer as makeLongRunOffer, type LongRunOffer } from "./workload";
|
||||||
|
import {
|
||||||
|
binomial,
|
||||||
|
factorizationText,
|
||||||
|
fibonacci,
|
||||||
|
greatestCommonDivisor,
|
||||||
|
integerReport,
|
||||||
|
isPrime,
|
||||||
|
leastCommonMultiple,
|
||||||
|
modularInverse,
|
||||||
|
} from "./number-theory";
|
||||||
|
import {
|
||||||
|
type Shape,
|
||||||
|
pythagoras,
|
||||||
|
shapeName,
|
||||||
|
shapeSummary,
|
||||||
|
triangleAnglesInDegrees,
|
||||||
|
triangleArea,
|
||||||
|
triangleFromSides,
|
||||||
|
triangleKind,
|
||||||
|
trianglePerimeter,
|
||||||
|
} from "./geometry";
|
||||||
|
import { TRIG_IDENTITIES, familyText, identityMatching, solveTrig } from "./trigonometry";
|
||||||
|
import { criticalPointText, criticalPoints, limit, limitText, taylor } from "./calculus";
|
||||||
|
import { definite, integrateWithConstant } from "./symbolic-integral";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Topics
|
||||||
|
|
||||||
|
export type AdvancedTopic =
|
||||||
|
| { kind: "integerReport"; value: number }
|
||||||
|
| { kind: "primality"; value: number }
|
||||||
|
| { kind: "factorize"; value: number }
|
||||||
|
| { kind: "gcd"; a: number; b: number }
|
||||||
|
| { kind: "lcm"; a: number; b: number }
|
||||||
|
| { kind: "modularInverse"; value: number; modulus: number }
|
||||||
|
| { kind: "fibonacci"; n: number }
|
||||||
|
| { kind: "binomial"; n: number; k: number }
|
||||||
|
| { kind: "symbolicIntegral"; expression: MathExpression; variable: string }
|
||||||
|
| { kind: "definiteIntegral"; expression: MathExpression; variable: string; from: number; to: number }
|
||||||
|
| { kind: "limit"; expression: MathExpression; variable: string; at: number }
|
||||||
|
| { kind: "taylor"; expression: MathExpression; variable: string; order: number }
|
||||||
|
| { kind: "criticalPoints"; expression: MathExpression; variable: string }
|
||||||
|
| { kind: "trigSolve"; fn: "sin" | "cos" | "tan"; value: number }
|
||||||
|
| { kind: "trigIdentity"; query: string }
|
||||||
|
/** "where does 11 first appear in pi" */
|
||||||
|
| { kind: "digitSearch"; pattern: string; constant: MathConstantName; occurrence: number }
|
||||||
|
/** "how many times does 42 appear in pi" */
|
||||||
|
| { kind: "digitCount"; pattern: string; constant: MathConstantName }
|
||||||
|
/** "what are digits 100 to 110 of pi" */
|
||||||
|
| { kind: "digitsAt"; constant: MathConstantName; from: number; to: number }
|
||||||
|
| { kind: "shapeArea"; shape: Shape }
|
||||||
|
| { kind: "triangleFromSides"; a: number; b: number; c: number }
|
||||||
|
| { kind: "pythagoras"; a: number | null; b: number | null; c: number | null };
|
||||||
|
|
||||||
|
export type AdvancedAnswer = {
|
||||||
|
headline: string;
|
||||||
|
detail: string;
|
||||||
|
/** Extra rows for the answer view, and for a longer readback. */
|
||||||
|
fields: [string, string][];
|
||||||
|
/**
|
||||||
|
* Set when this answer is only as good as the fast expansion allowed, and
|
||||||
|
* a deeper opted-in run would do better. The router itself never starts
|
||||||
|
* one: it is pure and synchronous, and the wait is a decision belonging to
|
||||||
|
* the caller.
|
||||||
|
*/
|
||||||
|
unresolvedWorkload: MathWorkload | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Parsing
|
||||||
|
|
||||||
|
/**
|
||||||
|
* null when the utterance is not an advanced-maths question, so the caller
|
||||||
|
* can fall through to the ordinary expression path.
|
||||||
|
*/
|
||||||
|
export function parseAdvanced(utterance: string): AdvancedTopic | null {
|
||||||
|
const text = applyNumberWords(utterance.toLowerCase()).replace(/^[ .,!?]+|[ .,!?]+$/g, "");
|
||||||
|
|
||||||
|
// Constants first: "the first 11 in pi" contains digits and the word "in",
|
||||||
|
// which the geometry and number-theory matchers would both take a swing at.
|
||||||
|
const constantTopic = parseConstantDigits(text);
|
||||||
|
if (constantTopic) return constantTopic;
|
||||||
|
const numberTopic = parseNumberTheory(text);
|
||||||
|
if (numberTopic) return numberTopic;
|
||||||
|
const calculusTopic = parseCalculus(text, utterance);
|
||||||
|
if (calculusTopic) return calculusTopic;
|
||||||
|
const trigTopic = parseTrigonometry(text);
|
||||||
|
if (trigTopic) return trigTopic;
|
||||||
|
return parseGeometry(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Constant digits ------------------------------------------------------------
|
||||||
|
|
||||||
|
function parseConstantDigits(text: string): AdvancedTopic | null {
|
||||||
|
// Must name a constant AND talk about its expansion, or "area of a circle"
|
||||||
|
// (which contains pi implicitly) would land here.
|
||||||
|
const constant = constantNamed(text);
|
||||||
|
if (!constant) return null;
|
||||||
|
const mentionsDigits =
|
||||||
|
text.includes("digit") ||
|
||||||
|
text.includes("appear") ||
|
||||||
|
text.includes("occur") ||
|
||||||
|
text.includes("within") ||
|
||||||
|
text.includes("inside") ||
|
||||||
|
text.includes("expansion") ||
|
||||||
|
text.includes("decimal place") ||
|
||||||
|
text.includes("position") ||
|
||||||
|
text.includes("show up") ||
|
||||||
|
text.includes("found in");
|
||||||
|
if (!mentionsDigits) return null;
|
||||||
|
|
||||||
|
const numbers = allInts(text);
|
||||||
|
|
||||||
|
// "digits 100 to 110 of pi"
|
||||||
|
if (
|
||||||
|
text.includes("digit") &&
|
||||||
|
text.includes(" to ") &&
|
||||||
|
numbers.length >= 2 &&
|
||||||
|
!text.includes("appear") &&
|
||||||
|
!text.includes("occur")
|
||||||
|
) {
|
||||||
|
const sorted = [numbers[0]!, numbers[1]!].sort((a, b) => a - b);
|
||||||
|
return { kind: "digitsAt", constant, from: sorted[0]!, to: sorted[1]! };
|
||||||
|
}
|
||||||
|
|
||||||
|
// "how many times does 42 appear"
|
||||||
|
if (text.includes("how many") || text.includes("count")) {
|
||||||
|
const pattern = numbers[0];
|
||||||
|
if (pattern === undefined) return null;
|
||||||
|
return { kind: "digitCount", pattern: String(pattern), constant };
|
||||||
|
}
|
||||||
|
|
||||||
|
const pattern = numbers[0];
|
||||||
|
if (pattern === undefined) return null;
|
||||||
|
// "the third time 11 appears"
|
||||||
|
const occurrence = ordinalIn(text) ?? 1;
|
||||||
|
return { kind: "digitSearch", pattern: String(pattern), constant, occurrence };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "3rd", not "3th". Cheap to get right and jarring to get wrong on a line
|
||||||
|
* someone reads aloud.
|
||||||
|
*/
|
||||||
|
export function ordinalWord(value: number): string {
|
||||||
|
switch (value) {
|
||||||
|
case 1:
|
||||||
|
return "first";
|
||||||
|
case 2:
|
||||||
|
return "second";
|
||||||
|
case 3:
|
||||||
|
return "third";
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let suffix: string;
|
||||||
|
const mod100 = value % 100;
|
||||||
|
const mod10 = value % 10;
|
||||||
|
if (mod100 === 11 || mod100 === 12 || mod100 === 13) suffix = "th";
|
||||||
|
else if (mod10 === 1) suffix = "st";
|
||||||
|
else if (mod10 === 2) suffix = "nd";
|
||||||
|
else if (mod10 === 3) suffix = "rd";
|
||||||
|
else suffix = "th";
|
||||||
|
return `${value}${suffix}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function ordinalIn(text: string): number | null {
|
||||||
|
const words: [string, number][] = [
|
||||||
|
["first", 1],
|
||||||
|
["second", 2],
|
||||||
|
["third", 3],
|
||||||
|
["fourth", 4],
|
||||||
|
["fifth", 5],
|
||||||
|
["sixth", 6],
|
||||||
|
["seventh", 7],
|
||||||
|
["eighth", 8],
|
||||||
|
["ninth", 9],
|
||||||
|
["tenth", 10],
|
||||||
|
];
|
||||||
|
for (const [word, value] of words) {
|
||||||
|
if (text.includes(word)) return value;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Number theory --------------------------------------------------------------
|
||||||
|
|
||||||
|
function parseNumberTheory(text: string): AdvancedTopic | null {
|
||||||
|
if (text.includes("prime") && !text.includes("factor")) {
|
||||||
|
const value = firstInt(text);
|
||||||
|
if (value !== null) return { kind: "primality", value };
|
||||||
|
}
|
||||||
|
if (text.includes("factor")) {
|
||||||
|
const value = firstInt(text);
|
||||||
|
if (value !== null) return { kind: "factorize", value };
|
||||||
|
}
|
||||||
|
if (text.includes("gcd") || text.includes("greatest common") || text.includes("highest common")) {
|
||||||
|
const values = allInts(text);
|
||||||
|
if (values.length >= 2) return { kind: "gcd", a: values[0]!, b: values[1]! };
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
text.includes("lcm") ||
|
||||||
|
text.includes("lowest common multiple") ||
|
||||||
|
text.includes("least common multiple")
|
||||||
|
) {
|
||||||
|
const values = allInts(text);
|
||||||
|
if (values.length >= 2) return { kind: "lcm", a: values[0]!, b: values[1]! };
|
||||||
|
}
|
||||||
|
if (text.includes("inverse") && text.includes("mod")) {
|
||||||
|
const values = allInts(text);
|
||||||
|
if (values.length >= 2) return { kind: "modularInverse", value: values[0]!, modulus: values[1]! };
|
||||||
|
}
|
||||||
|
if (text.includes("fibonacci")) {
|
||||||
|
const value = firstInt(text);
|
||||||
|
if (value !== null) return { kind: "fibonacci", n: value };
|
||||||
|
}
|
||||||
|
if (text.includes("choose") || text.includes("binomial") || text.includes("combinations")) {
|
||||||
|
const values = allInts(text);
|
||||||
|
if (values.length >= 2) return { kind: "binomial", n: values[0]!, k: values[1]! };
|
||||||
|
}
|
||||||
|
if (text.includes("tell me about") || text.includes("facts about")) {
|
||||||
|
const value = firstInt(text);
|
||||||
|
if (value !== null) return { kind: "integerReport", value };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculus -------------------------------------------------------------------
|
||||||
|
|
||||||
|
function parseCalculus(text: string, original: string): AdvancedTopic | null {
|
||||||
|
if (text.includes("integral") || text.includes("integrate") || text.includes("antiderivative")) {
|
||||||
|
const expression = expressionTail(original, ["integral of", "integrate", "antiderivative of", "integral"]);
|
||||||
|
if (!expression) return null;
|
||||||
|
const variable = variablesOf(expression)[0] ?? "x";
|
||||||
|
const bounds = boundsIn(text);
|
||||||
|
if (bounds) {
|
||||||
|
return { kind: "definiteIntegral", expression, variable, from: bounds[0], to: bounds[1] };
|
||||||
|
}
|
||||||
|
return { kind: "symbolicIntegral", expression, variable };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text.includes("limit")) {
|
||||||
|
const expression = expressionTail(original, ["limit of", "the limit of", "limit"]);
|
||||||
|
if (!expression) return null;
|
||||||
|
// "as x approaches 0"
|
||||||
|
const point = firstDoubleAfter(["approaches", "approaching", "tends to", "goes to"], text) ?? 0;
|
||||||
|
return { kind: "limit", expression, variable: variablesOf(expression)[0] ?? "x", at: point };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text.includes("taylor") || text.includes("maclaurin") || text.includes("series")) {
|
||||||
|
const expression = expressionTail(original, [
|
||||||
|
"series of",
|
||||||
|
"series for",
|
||||||
|
"expansion of",
|
||||||
|
"taylor",
|
||||||
|
"maclaurin",
|
||||||
|
]);
|
||||||
|
if (!expression) return null;
|
||||||
|
const orderValue = firstDoubleAfter(["order", "to order", "terms"], text);
|
||||||
|
const order = orderValue !== null ? Math.trunc(orderValue) : 5;
|
||||||
|
return { kind: "taylor", expression, variable: variablesOf(expression)[0] ?? "x", order };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
text.includes("critical point") ||
|
||||||
|
text.includes("turning point") ||
|
||||||
|
text.includes("maximum") ||
|
||||||
|
text.includes("minimum") ||
|
||||||
|
text.includes("extrema")
|
||||||
|
) {
|
||||||
|
const expression = expressionTail(original, [
|
||||||
|
"critical points of",
|
||||||
|
"turning points of",
|
||||||
|
"extrema of",
|
||||||
|
"maximum of",
|
||||||
|
"minimum of",
|
||||||
|
"of",
|
||||||
|
]);
|
||||||
|
if (!expression) return null;
|
||||||
|
return { kind: "criticalPoints", expression, variable: variablesOf(expression)[0] ?? "x" };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trigonometry ---------------------------------------------------------------
|
||||||
|
|
||||||
|
function parseTrigonometry(text: string): AdvancedTopic | null {
|
||||||
|
if (text.includes("identity") || text.includes("law of")) {
|
||||||
|
return { kind: "trigIdentity", query: text };
|
||||||
|
}
|
||||||
|
// "solve sin x = 0.5"
|
||||||
|
for (const name of ["sin", "cos", "tan"] as const) {
|
||||||
|
if (!text.includes(name)) continue;
|
||||||
|
if (!text.includes("=") && !text.includes("equals")) continue;
|
||||||
|
const value = lastDouble(text);
|
||||||
|
if (value === null) continue;
|
||||||
|
return { kind: "trigSolve", fn: name, value };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Geometry -------------------------------------------------------------------
|
||||||
|
|
||||||
|
function parseGeometry(text: string): AdvancedTopic | null {
|
||||||
|
const numbers = allDoubles(text);
|
||||||
|
|
||||||
|
if (text.includes("pythagoras") || text.includes("hypotenuse")) {
|
||||||
|
if (numbers.length < 2) return null;
|
||||||
|
return text.includes("hypotenuse") && text.includes("find")
|
||||||
|
? { kind: "pythagoras", a: numbers[0]!, b: numbers[1]!, c: null }
|
||||||
|
: { kind: "pythagoras", a: numbers[0]!, b: null, c: numbers[1]! };
|
||||||
|
}
|
||||||
|
if (text.includes("triangle") && numbers.length >= 3 && text.includes("side")) {
|
||||||
|
return { kind: "triangleFromSides", a: numbers[0]!, b: numbers[1]!, c: numbers[2]! };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shapes, longest name first so "rectangular prism" is not read as
|
||||||
|
// "rectangle".
|
||||||
|
const shapes: [string, (values: number[]) => Shape | null][] = [
|
||||||
|
[
|
||||||
|
"rectangular prism",
|
||||||
|
(values) =>
|
||||||
|
values.length >= 3
|
||||||
|
? { kind: "rectangularPrism", length: values[0]!, width: values[1]!, height: values[2]! }
|
||||||
|
: null,
|
||||||
|
],
|
||||||
|
["sphere", (values) => (values.length >= 1 ? { kind: "sphere", radius: values[0]! } : null)],
|
||||||
|
[
|
||||||
|
"cylinder",
|
||||||
|
(values) => (values.length >= 2 ? { kind: "cylinder", radius: values[0]!, height: values[1]! } : null),
|
||||||
|
],
|
||||||
|
["cone", (values) => (values.length >= 2 ? { kind: "cone", radius: values[0]!, height: values[1]! } : null)],
|
||||||
|
["cube", (values) => (values.length >= 1 ? { kind: "cube", side: values[0]! } : null)],
|
||||||
|
["circle", (values) => (values.length >= 1 ? { kind: "circle", radius: values[0]! } : null)],
|
||||||
|
[
|
||||||
|
"rectangle",
|
||||||
|
(values) => (values.length >= 2 ? { kind: "rectangle", width: values[0]!, height: values[1]! } : null),
|
||||||
|
],
|
||||||
|
["square", (values) => (values.length >= 1 ? { kind: "square", side: values[0]! } : null)],
|
||||||
|
[
|
||||||
|
"trapezoid",
|
||||||
|
(values) =>
|
||||||
|
values.length >= 3 ? { kind: "trapezoid", a: values[0]!, b: values[1]!, height: values[2]! } : null,
|
||||||
|
],
|
||||||
|
["ellipse", (values) => (values.length >= 2 ? { kind: "ellipse", a: values[0]!, b: values[1]! } : null)],
|
||||||
|
];
|
||||||
|
const wantsMeasurement =
|
||||||
|
text.includes("area") ||
|
||||||
|
text.includes("volume") ||
|
||||||
|
text.includes("perimeter") ||
|
||||||
|
text.includes("circumference") ||
|
||||||
|
text.includes("surface");
|
||||||
|
if (!wantsMeasurement) return null;
|
||||||
|
for (const [name, build] of shapes) {
|
||||||
|
if (!text.includes(name)) continue;
|
||||||
|
const shape = build(numbers);
|
||||||
|
if (shape) return { kind: "shapeArea", shape };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Answering
|
||||||
|
|
||||||
|
export function answerAdvanced(topic: AdvancedTopic): AdvancedAnswer {
|
||||||
|
switch (topic.kind) {
|
||||||
|
case "integerReport": {
|
||||||
|
const report = integerReport(topic.value);
|
||||||
|
const fields: [string, string][] = [
|
||||||
|
["Prime", report.isPrime ? "yes" : "no"],
|
||||||
|
["Factorisation", factorizationText(report)],
|
||||||
|
["Divisors", String(report.divisorCount)],
|
||||||
|
["Divisor sum", String(report.divisorSum)],
|
||||||
|
["Totient", String(report.totient)],
|
||||||
|
["Digit sum", String(report.digitSum)],
|
||||||
|
["Digital root", String(report.digitalRoot)],
|
||||||
|
];
|
||||||
|
if (report.isPerfect) fields.push(["Perfect", "yes"]);
|
||||||
|
return answer(
|
||||||
|
`${topic.value} = ${factorizationText(report)}`,
|
||||||
|
`${topic.value} is ${report.isPrime ? "prime" : "composite"}, ` +
|
||||||
|
`with ${report.divisorCount} divisors summing to ${report.divisorSum}.`,
|
||||||
|
fields,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "primality": {
|
||||||
|
const prime = isPrime(topic.value);
|
||||||
|
const report = prime ? "" : factorizationText(integerReport(topic.value));
|
||||||
|
return answer(
|
||||||
|
`${topic.value} is ${prime ? "prime" : "not prime"}`,
|
||||||
|
prime
|
||||||
|
? `${topic.value} has no divisors other than 1 and itself.`
|
||||||
|
: `${topic.value} = ${report}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "factorize": {
|
||||||
|
const report = integerReport(topic.value);
|
||||||
|
return answer(
|
||||||
|
`${topic.value} = ${factorizationText(report)}`,
|
||||||
|
`${topic.value} factors into ${factorizationText(report)}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "gcd": {
|
||||||
|
const gcd = greatestCommonDivisor(topic.a, topic.b);
|
||||||
|
return answer(
|
||||||
|
`gcd(${topic.a}, ${topic.b}) = ${gcd}`,
|
||||||
|
`The greatest common divisor of ${topic.a} and ${topic.b} is ${gcd}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "lcm": {
|
||||||
|
const lcm = leastCommonMultiple(topic.a, topic.b);
|
||||||
|
return answer(
|
||||||
|
`lcm(${topic.a}, ${topic.b}) = ${lcm}`,
|
||||||
|
`The least common multiple of ${topic.a} and ${topic.b} is ${lcm}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "modularInverse": {
|
||||||
|
const inverse = modularInverse(topic.value, topic.modulus);
|
||||||
|
if (inverse === null) {
|
||||||
|
return answer(
|
||||||
|
"No inverse",
|
||||||
|
`${topic.value} and ${topic.modulus} share a factor, so no modular inverse exists.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
`${topic.value}⁻¹ ≡ ${inverse} (mod ${topic.modulus})`,
|
||||||
|
`${topic.value} × ${inverse} ≡ 1 (mod ${topic.modulus}).`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "fibonacci": {
|
||||||
|
const value = fibonacci(topic.n);
|
||||||
|
if (value === null) {
|
||||||
|
return answer("Too large", `F(${topic.n}) does not fit in an exact integer.`);
|
||||||
|
}
|
||||||
|
return answer(`F(${topic.n}) = ${value}`, `The ${topic.n}th Fibonacci number is ${value}.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "binomial": {
|
||||||
|
const value = binomial(topic.n, topic.k);
|
||||||
|
if (value === null) {
|
||||||
|
return answer("Undefined", `${topic.n} choose ${topic.k} is not defined.`);
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
`C(${topic.n}, ${topic.k}) = ${value}`,
|
||||||
|
`There are ${value} ways to choose ${topic.k} from ${topic.n}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "symbolicIntegral": {
|
||||||
|
const antiderivative = integrateWithConstant(topic.expression, topic.variable);
|
||||||
|
if (!antiderivative) {
|
||||||
|
return answer(
|
||||||
|
"No closed form",
|
||||||
|
"This has no elementary antiderivative that this build can find. " +
|
||||||
|
"Ask for a definite integral and it will be computed numerically.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
`∫ = ${plain(antiderivative)}`,
|
||||||
|
`∫ ${plain(topic.expression)} d${topic.variable} = ${plain(antiderivative)}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "definiteIntegral": {
|
||||||
|
const result = definite(topic.expression, topic.variable, topic.from, topic.to);
|
||||||
|
switch (result.kind) {
|
||||||
|
case "exact":
|
||||||
|
return answer(
|
||||||
|
`∫ = ${describeNumber(result.value)}`,
|
||||||
|
`Using F = ${plain(result.antiderivative)}, the definite integral is ${describeNumber(result.value)}.`,
|
||||||
|
);
|
||||||
|
case "numeric":
|
||||||
|
return answer(
|
||||||
|
`∫ ≈ ${describeNumber(fromDecimal(result.value))}`,
|
||||||
|
"No closed form was found, so this was integrated numerically.",
|
||||||
|
);
|
||||||
|
case "failed":
|
||||||
|
return answer("Could not integrate", result.reason);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "limit": {
|
||||||
|
const result = limit(topic.expression, topic.variable, topic.at);
|
||||||
|
let detail =
|
||||||
|
`As ${topic.variable} → ${format(topic.at)}, ` +
|
||||||
|
`${plain(topic.expression)} → ${limitText(result)}.`;
|
||||||
|
if (result.kind === "doesNotExist") {
|
||||||
|
detail =
|
||||||
|
`The one-sided limits disagree ` +
|
||||||
|
`(${format(result.left ?? 0)} from the left, ${format(result.right ?? 0)} from the right), ` +
|
||||||
|
`so the limit does not exist.`;
|
||||||
|
}
|
||||||
|
return answer(`limit = ${limitText(result)}`, detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "taylor": {
|
||||||
|
const series = taylor(topic.expression, topic.variable, topic.order);
|
||||||
|
if (!series) {
|
||||||
|
return answer("No series", "Could not expand that about 0.");
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
plain(series),
|
||||||
|
`${plain(topic.expression)} ≈ ${plain(series)} to order ${topic.order}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "criticalPoints": {
|
||||||
|
const points = criticalPoints(topic.expression, topic.variable);
|
||||||
|
if (points.length === 0) {
|
||||||
|
return answer("No critical points", "The derivative never vanishes in the search window.");
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
points
|
||||||
|
.slice(0, 2)
|
||||||
|
.map(criticalPointText)
|
||||||
|
.join(", "),
|
||||||
|
points.map(criticalPointText).join("; "),
|
||||||
|
points.map((point) => [
|
||||||
|
point.kind.charAt(0).toUpperCase() + point.kind.slice(1),
|
||||||
|
`(${format(point.x)}, ${format(point.y)})`,
|
||||||
|
]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "trigSolve": {
|
||||||
|
const solution = solveTrig(topic.fn, topic.value);
|
||||||
|
switch (solution.kind) {
|
||||||
|
case "none":
|
||||||
|
return answer("No solution", `${topic.fn} never reaches ${format(topic.value)}.`);
|
||||||
|
case "all":
|
||||||
|
return answer("True for every angle", "Any value works.");
|
||||||
|
case "families": {
|
||||||
|
const text = solution.families.map(familyText).join(", ");
|
||||||
|
return answer(
|
||||||
|
`x = ${text}`,
|
||||||
|
`${topic.fn} x = ${format(topic.value)} for x = ${text}, where n is any integer.`,
|
||||||
|
solution.families.map((family, index) => [`Family ${index + 1}`, familyText(family)]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "trigIdentity": {
|
||||||
|
const identity = identityMatching(topic.query);
|
||||||
|
if (!identity) {
|
||||||
|
return answer(
|
||||||
|
"Not in the sheet",
|
||||||
|
"Known identities: " + TRIG_IDENTITIES.map((entry) => entry.name).join(", "),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return answer(identity.plain, `${identity.name}: ${identity.plain}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "digitSearch": {
|
||||||
|
const outcome = findDigits(topic.pattern, topic.constant, topic.occurrence);
|
||||||
|
switch (outcome.kind) {
|
||||||
|
case "invalidPattern":
|
||||||
|
return answer("Cannot search", outcome.reason);
|
||||||
|
case "notFound": {
|
||||||
|
// "Not in pi" and "not in the first 10,000 digits of pi" are very
|
||||||
|
// different claims, and only the second one is true.
|
||||||
|
let detail =
|
||||||
|
`${topic.pattern} does not appear in the first ` +
|
||||||
|
`${formatInt(outcome.searchedDigits)} digits of ${constantSpokenName(topic.constant)}.`;
|
||||||
|
const expected = expectedFirstPosition(topic.pattern.length);
|
||||||
|
if (expected !== null && expected > outcome.searchedDigits) {
|
||||||
|
const article = [8, 11, 18].includes(topic.pattern.length) ? "An" : "A";
|
||||||
|
detail +=
|
||||||
|
` ${article} ${topic.pattern.length}-digit run turns up around the ` +
|
||||||
|
`${formatInt(expected)}th place on average, so this needs a deeper expansion.`;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
headline: `Not in the first ${formatInt(outcome.searchedDigits)} digits`,
|
||||||
|
detail,
|
||||||
|
fields: [],
|
||||||
|
unresolvedWorkload: {
|
||||||
|
kind: "digitSearch",
|
||||||
|
constant: topic.constant,
|
||||||
|
pattern: topic.pattern,
|
||||||
|
occurrence: topic.occurrence,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
case "found": {
|
||||||
|
const match = outcome.match;
|
||||||
|
const ordinalText = ordinalWord(topic.occurrence);
|
||||||
|
const places =
|
||||||
|
match.start === match.end ? `place ${match.start}` : `places ${match.start}–${match.end}`;
|
||||||
|
return answer(
|
||||||
|
`${constantDisplayName(topic.constant)}: ${places}`,
|
||||||
|
`The ${ordinalText} appearance of ${topic.pattern} in ${constantSpokenName(topic.constant)} ` +
|
||||||
|
`is at decimal ${places}, in …${highlightedMatch(match)}…`,
|
||||||
|
[
|
||||||
|
["Start", String(match.start)],
|
||||||
|
["End", String(match.end)],
|
||||||
|
["Context", highlightedMatch(match)],
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "digitCount": {
|
||||||
|
const counted = countDigitsIn(topic.pattern, topic.constant);
|
||||||
|
return {
|
||||||
|
headline: `${counted.occurrences} time${counted.occurrences === 1 ? "" : "s"}`,
|
||||||
|
detail:
|
||||||
|
`${topic.pattern} appears ${counted.occurrences} time${counted.occurrences === 1 ? "" : "s"} ` +
|
||||||
|
`in the first ${formatInt(counted.searchedDigits)} digits of ${constantSpokenName(topic.constant)}.`,
|
||||||
|
fields: [["Searched", `${formatInt(counted.searchedDigits)} digits`]],
|
||||||
|
unresolvedWorkload: { kind: "digitCount", constant: topic.constant, pattern: topic.pattern },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
case "digitsAt": {
|
||||||
|
if (topic.to - topic.from >= 200) {
|
||||||
|
return answer("Too many digits", "Ask for a span under 200 digits.");
|
||||||
|
}
|
||||||
|
const digits = digitsAt(topic.constant, topic.from, topic.to);
|
||||||
|
if (!digits) {
|
||||||
|
return {
|
||||||
|
headline: "Out of range",
|
||||||
|
detail:
|
||||||
|
`That is past the ${formatInt(MAXIMUM_COMPUTED_DIGITS)} ` +
|
||||||
|
`digits computed on device.`,
|
||||||
|
fields: [],
|
||||||
|
unresolvedWorkload: { kind: "constantDigits", constant: topic.constant, count: topic.to },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
digits,
|
||||||
|
`Decimal places ${topic.from}–${topic.to} of ${constantSpokenName(topic.constant)} are ${digits}.`,
|
||||||
|
[["Places", `${topic.from}–${topic.to}`]],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "shapeArea": {
|
||||||
|
const parts = shapeSummary(topic.shape);
|
||||||
|
if (parts.length === 0) {
|
||||||
|
return answer("Not enough measurements", "That shape needs more values.");
|
||||||
|
}
|
||||||
|
return answer(
|
||||||
|
parts.map(([label, value]) => `${label} ${format(value)}`).join(", "),
|
||||||
|
`For that ${shapeName(topic.shape)}: ` +
|
||||||
|
parts.map(([label, value]) => `${label.toLowerCase()} ${format(value)}`).join(", ") +
|
||||||
|
".",
|
||||||
|
parts.map(([label, value]) => [label, format(value)]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "triangleFromSides": {
|
||||||
|
const result = triangleFromSides(topic.a, topic.b, topic.c);
|
||||||
|
switch (result.kind) {
|
||||||
|
case "impossible":
|
||||||
|
return answer("No such triangle", result.reason);
|
||||||
|
case "one":
|
||||||
|
case "two": {
|
||||||
|
const triangle = result.kind === "one" ? result.triangle : result.first;
|
||||||
|
const [angleA, angleB, angleC] = triangleAnglesInDegrees(triangle);
|
||||||
|
return answer(
|
||||||
|
`Area ${format(triangleArea(triangle))}, ${triangleKind(triangle)}`,
|
||||||
|
`Angles ${format(angleA)}°, ${format(angleB)}°, ${format(angleC)}°; ` +
|
||||||
|
`area ${format(triangleArea(triangle))}; perimeter ${format(trianglePerimeter(triangle))}.`,
|
||||||
|
[
|
||||||
|
["Angle A", `${format(angleA)}°`],
|
||||||
|
["Angle B", `${format(angleB)}°`],
|
||||||
|
["Angle C", `${format(angleC)}°`],
|
||||||
|
["Area", format(triangleArea(triangle))],
|
||||||
|
["Perimeter", format(trianglePerimeter(triangle))],
|
||||||
|
["Type", triangleKind(triangle)],
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "pythagoras": {
|
||||||
|
const missing = pythagoras(topic.a, topic.b, topic.c);
|
||||||
|
if (missing === null) {
|
||||||
|
return answer(
|
||||||
|
"Cannot solve",
|
||||||
|
"Give two of the three sides, and a leg must be shorter than the hypotenuse.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return answer(format(missing), `The missing side is ${format(missing)}.`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function answer(headline: string, detail: string, fields: [string, string][] = []): AdvancedAnswer {
|
||||||
|
return { headline, detail, fields, unresolvedWorkload: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Extraction helpers
|
||||||
|
|
||||||
|
export function firstInt(text: string): number | null {
|
||||||
|
return allInts(text)[0] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function allInts(text: string): number[] {
|
||||||
|
return (text.match(/-?\d+/g) ?? []).map(Number).filter(Number.isSafeInteger);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function allDoubles(text: string): number[] {
|
||||||
|
return (text.match(/-?\d+(?:\.\d+)?/g) ?? []).map(Number).filter(Number.isFinite);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function lastDouble(text: string): number | null {
|
||||||
|
const values = allDoubles(text);
|
||||||
|
return values.length > 0 ? values[values.length - 1]! : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function firstDoubleAfter(keywords: string[], text: string): number | null {
|
||||||
|
for (const keyword of keywords) {
|
||||||
|
const index = text.indexOf(keyword);
|
||||||
|
if (index < 0) continue;
|
||||||
|
const tail = text.slice(index + keyword.length);
|
||||||
|
const value = allDoubles(tail)[0];
|
||||||
|
if (value !== undefined) return value;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** "from 0 to 5" */
|
||||||
|
export function boundsIn(text: string): [number, number] | null {
|
||||||
|
const match = text.match(/from\s+(-?[0-9.]+)\s+to\s+(-?[0-9.]+)/);
|
||||||
|
if (!match) return null;
|
||||||
|
const lower = Number(match[1]);
|
||||||
|
const upper = Number(match[2]);
|
||||||
|
if (!Number.isFinite(lower) || !Number.isFinite(upper)) return null;
|
||||||
|
return [lower, upper];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Take everything after the topic keyword and parse it as an expression. */
|
||||||
|
function expressionTail(original: string, keywords: string[]): MathExpression | null {
|
||||||
|
const lowered = original.toLowerCase();
|
||||||
|
for (const keyword of [...keywords].sort((a, b) => b.length - a.length)) {
|
||||||
|
const index = lowered.indexOf(keyword);
|
||||||
|
if (index < 0) continue;
|
||||||
|
let tail = original.slice(index + keyword.length);
|
||||||
|
// Drop trailing clauses that belong to the command, not the maths.
|
||||||
|
for (const terminator of [" from ", " as ", " with respect to ", " to order ", " dx"]) {
|
||||||
|
const cut = tail.toLowerCase().indexOf(terminator);
|
||||||
|
if (cut >= 0) tail = tail.slice(0, cut);
|
||||||
|
}
|
||||||
|
const trimmed = tail.replace(/^[ .,?]+|[ .,?]+$/g, "");
|
||||||
|
if (!trimmed) continue;
|
||||||
|
try {
|
||||||
|
return parseSpoken(trimmed);
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function format(value: number): string {
|
||||||
|
return describeNumber(fromDecimal(value));
|
||||||
|
}
|
||||||
@@ -0,0 +1,359 @@
|
|||||||
|
// Limits, Taylor series, and curve analysis.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
addExpr,
|
||||||
|
divideExpr,
|
||||||
|
multiplyExpr,
|
||||||
|
num,
|
||||||
|
numberValue,
|
||||||
|
powerExpr,
|
||||||
|
subtractExpr,
|
||||||
|
variable as variableExpr,
|
||||||
|
ONE,
|
||||||
|
ZERO,
|
||||||
|
} from "./expression";
|
||||||
|
import { describeNumber, divide as divideNumber, fromDecimal, integer, isNegative, isOne, negated } from "./math-number";
|
||||||
|
import { evaluateValue } from "./evaluator";
|
||||||
|
import { differentiate } from "./derivative";
|
||||||
|
import { simplify } from "./simplifier";
|
||||||
|
import { Polynomial } from "./polynomial";
|
||||||
|
import { numericRoots as polynomialNumericRoots } from "./solver";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Limits
|
||||||
|
|
||||||
|
export type LimitApproach = "both" | "fromLeft" | "fromRight";
|
||||||
|
|
||||||
|
export type LimitResult =
|
||||||
|
| { kind: "value"; value: number }
|
||||||
|
| { kind: "positiveInfinity" }
|
||||||
|
| { kind: "negativeInfinity" }
|
||||||
|
/** One-sided limits disagree, so the two-sided limit does not exist. */
|
||||||
|
| { kind: "doesNotExist"; left: number | null; right: number | null }
|
||||||
|
| { kind: "indeterminate" };
|
||||||
|
|
||||||
|
export function limitText(result: LimitResult): string {
|
||||||
|
switch (result.kind) {
|
||||||
|
case "value":
|
||||||
|
return describeNumber(fromDecimal(result.value));
|
||||||
|
case "positiveInfinity":
|
||||||
|
return "+∞";
|
||||||
|
case "negativeInfinity":
|
||||||
|
return "−∞";
|
||||||
|
case "doesNotExist":
|
||||||
|
return "does not exist";
|
||||||
|
case "indeterminate":
|
||||||
|
return "indeterminate";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Limit of `expression` as `variable` → `point`.
|
||||||
|
*
|
||||||
|
* Direct substitution first, then L'Hôpital for 0/0 and ∞/∞, then a numeric
|
||||||
|
* squeeze. The order matters: substitution is exact when it works, L'Hôpital
|
||||||
|
* is exact when it applies, and only the leftovers get the approximate
|
||||||
|
* treatment.
|
||||||
|
*/
|
||||||
|
export function limit(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
point: number,
|
||||||
|
approach: LimitApproach = "both",
|
||||||
|
): LimitResult {
|
||||||
|
if (approach === "both" && Number.isFinite(point)) {
|
||||||
|
const direct = evaluateValue(expression, { [variable]: point });
|
||||||
|
if (direct !== null && Number.isFinite(direct)) {
|
||||||
|
return { kind: "value", value: direct };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const hospital = lHopital(expression, variable, point, 0);
|
||||||
|
if (hospital) return hospital;
|
||||||
|
return numericLimit(expression, variable, point, approach);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Detect an indeterminate quotient and differentiate top and bottom. */
|
||||||
|
function lHopital(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
point: number,
|
||||||
|
depth: number,
|
||||||
|
): LimitResult | null {
|
||||||
|
// Bounded: a quotient that stays indeterminate forever (sin(1/x)/x) must
|
||||||
|
// give up rather than recurse without end.
|
||||||
|
if (depth >= 8 || !Number.isFinite(point)) return null;
|
||||||
|
const quotient = asQuotient(expression);
|
||||||
|
if (!quotient) return null;
|
||||||
|
const [numerator, denominator] = quotient;
|
||||||
|
|
||||||
|
const top = evaluateValue(numerator, { [variable]: point });
|
||||||
|
const bottom = evaluateValue(denominator, { [variable]: point });
|
||||||
|
if (top === null || bottom === null) return null;
|
||||||
|
|
||||||
|
const isZeroOverZero = Math.abs(top) < 1e-12 && Math.abs(bottom) < 1e-12;
|
||||||
|
const isInfinityOverInfinity = !Number.isFinite(top) && !Number.isFinite(bottom);
|
||||||
|
if (!isZeroOverZero && !isInfinityOverInfinity) return null;
|
||||||
|
|
||||||
|
const dTop = differentiate(numerator, variable);
|
||||||
|
const dBottom = differentiate(denominator, variable);
|
||||||
|
// A vanishing derivative of the denominator means the rule does not apply
|
||||||
|
// again; fall through to the numeric path.
|
||||||
|
const bottomValue = evaluateValue(dBottom, { [variable]: point });
|
||||||
|
if (bottomValue === null || !Number.isFinite(bottomValue)) return null;
|
||||||
|
|
||||||
|
if (Math.abs(bottomValue) > 1e-12) {
|
||||||
|
const topValue = evaluateValue(dTop, { [variable]: point });
|
||||||
|
if (topValue !== null && Number.isFinite(topValue)) {
|
||||||
|
return { kind: "value", value: topValue / bottomValue };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return lHopital(divideExpr(dTop, dBottom), variable, point, depth + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Recognise `a / b`, which the tree stores as `a · b^-1`. */
|
||||||
|
export function asQuotient(expression: MathExpression): [MathExpression, MathExpression] | null {
|
||||||
|
if (expression.type !== "multiply") return null;
|
||||||
|
const numerator: MathExpression[] = [];
|
||||||
|
const denominator: MathExpression[] = [];
|
||||||
|
for (const factor of expression.factors) {
|
||||||
|
if (factor.type === "power") {
|
||||||
|
const power = numberValue(factor.exponent);
|
||||||
|
if (power && isNegative(power)) {
|
||||||
|
const positive = negated(power);
|
||||||
|
denominator.push(isOne(positive) ? factor.base : powerExpr(factor.base, num(positive)));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
numerator.push(factor);
|
||||||
|
}
|
||||||
|
if (denominator.length === 0) return null;
|
||||||
|
return [
|
||||||
|
numerator.length === 0 ? ONE : numerator.length === 1 ? numerator[0]! : multiplyExpr(numerator),
|
||||||
|
denominator.length === 1 ? denominator[0]! : multiplyExpr(denominator),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
function numericLimit(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
point: number,
|
||||||
|
approach: LimitApproach,
|
||||||
|
): LimitResult {
|
||||||
|
const sampleSide = (side: LimitApproach): number | null => {
|
||||||
|
if (!Number.isFinite(point)) {
|
||||||
|
// At infinity, march outward instead of shrinking a step.
|
||||||
|
const sign = point > 0 ? 1 : -1;
|
||||||
|
let last: number | null = null;
|
||||||
|
for (const magnitude of [1e3, 1e4, 1e5, 1e6, 1e7]) {
|
||||||
|
const value = evaluateValue(expression, { [variable]: sign * magnitude });
|
||||||
|
if (value === null || !Number.isFinite(value)) return last;
|
||||||
|
last = value;
|
||||||
|
}
|
||||||
|
return last;
|
||||||
|
}
|
||||||
|
const samples: number[] = [];
|
||||||
|
for (const step of [1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7]) {
|
||||||
|
const offset = side === "fromLeft" ? -step : step;
|
||||||
|
const value = evaluateValue(expression, { [variable]: point + offset });
|
||||||
|
if (value === null || !Number.isFinite(value)) continue;
|
||||||
|
samples.push(value);
|
||||||
|
}
|
||||||
|
const last = samples[samples.length - 1];
|
||||||
|
if (last === undefined) return null;
|
||||||
|
// Divergence is a TREND, not a threshold. 1/x reaches only 1e7 at the
|
||||||
|
// smallest step sampled here, so a fixed "> 1e12" cutoff calls it finite;
|
||||||
|
// magnitudes growing by an order per step do not.
|
||||||
|
if (samples.length >= 3) {
|
||||||
|
const tail = samples.slice(-3);
|
||||||
|
const magnitudes = tail.map((value) => Math.abs(value));
|
||||||
|
const growing = magnitudes.every(
|
||||||
|
(value, index) => index === 0 || value > magnitudes[index - 1]! * 5,
|
||||||
|
);
|
||||||
|
if (growing && (magnitudes[magnitudes.length - 1] ?? 0) > 1e4) {
|
||||||
|
return last > 0 ? Infinity : -Infinity;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return last;
|
||||||
|
};
|
||||||
|
|
||||||
|
switch (approach) {
|
||||||
|
case "fromLeft": {
|
||||||
|
const value = sampleSide("fromLeft");
|
||||||
|
return value === null ? { kind: "indeterminate" } : classify(value);
|
||||||
|
}
|
||||||
|
case "fromRight": {
|
||||||
|
const value = sampleSide("fromRight");
|
||||||
|
return value === null ? { kind: "indeterminate" } : classify(value);
|
||||||
|
}
|
||||||
|
case "both": {
|
||||||
|
const left = sampleSide("fromLeft");
|
||||||
|
const right = sampleSide("fromRight");
|
||||||
|
if (left === null || right === null) return { kind: "indeterminate" };
|
||||||
|
// Scale-relative comparison: two values near 1e6 differing by 1 are the
|
||||||
|
// same limit; two near 0 differing by 1 are not.
|
||||||
|
const scale = Math.max(Math.abs(left), Math.abs(right), 1);
|
||||||
|
if (Math.abs(left - right) >= 1e-4 * scale) {
|
||||||
|
return { kind: "doesNotExist", left, right };
|
||||||
|
}
|
||||||
|
return classify((left + right) / 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function classify(value: number): LimitResult {
|
||||||
|
if (!Number.isFinite(value)) {
|
||||||
|
return value > 0 ? { kind: "positiveInfinity" } : { kind: "negativeInfinity" };
|
||||||
|
}
|
||||||
|
if (value > 1e12) return { kind: "positiveInfinity" };
|
||||||
|
if (value < -1e12) return { kind: "negativeInfinity" };
|
||||||
|
return { kind: "value", value };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Series
|
||||||
|
|
||||||
|
/** Taylor expansion about `centre`, to `order` terms. */
|
||||||
|
export function taylor(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
order = 5,
|
||||||
|
centre = 0,
|
||||||
|
): MathExpression | null {
|
||||||
|
if (order < 0 || order > 12) return null;
|
||||||
|
const terms: MathExpression[] = [];
|
||||||
|
let derivative = expression;
|
||||||
|
let factorial = 1;
|
||||||
|
|
||||||
|
for (let degree = 0; degree <= order; degree++) {
|
||||||
|
if (degree > 0) {
|
||||||
|
derivative = differentiate(derivative, variable);
|
||||||
|
factorial *= degree;
|
||||||
|
}
|
||||||
|
const coefficient = evaluateValue(derivative, { [variable]: centre });
|
||||||
|
if (coefficient === null || !Number.isFinite(coefficient)) return null;
|
||||||
|
if (Math.abs(coefficient) <= 1e-12) continue;
|
||||||
|
|
||||||
|
const scaled = divideNumber(fromDecimal(coefficient), integer(factorial));
|
||||||
|
const shifted: MathExpression =
|
||||||
|
centre === 0
|
||||||
|
? variableExpr(variable)
|
||||||
|
: subtractExpr(variableExpr(variable), num(fromDecimal(centre)));
|
||||||
|
const power: MathExpression =
|
||||||
|
degree === 0 ? ONE : degree === 1 ? shifted : powerExpr(shifted, num(integer(degree)));
|
||||||
|
terms.push(degree === 0 ? num(scaled) : multiplyExpr([num(scaled), power]));
|
||||||
|
}
|
||||||
|
if (terms.length === 0) return ZERO;
|
||||||
|
return simplify(addExpr(terms));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Curve analysis
|
||||||
|
|
||||||
|
export type CriticalPointKind = "minimum" | "maximum" | "inflection" | "undetermined";
|
||||||
|
|
||||||
|
export type CriticalPoint = {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
kind: CriticalPointKind;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function criticalPointText(point: CriticalPoint): string {
|
||||||
|
const xText = describeNumber(fromDecimal(point.x));
|
||||||
|
const yText = describeNumber(fromDecimal(point.y));
|
||||||
|
return `${point.kind} at (${xText}, ${yText})`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Critical points classified by the second derivative, falling back to a
|
||||||
|
* sign test where the second derivative vanishes.
|
||||||
|
*/
|
||||||
|
export function criticalPoints(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
range: [number, number] = [-50, 50],
|
||||||
|
): CriticalPoint[] {
|
||||||
|
const first = differentiate(expression, variable);
|
||||||
|
const second = differentiate(first, variable);
|
||||||
|
|
||||||
|
let roots: number[];
|
||||||
|
const polynomial = Polynomial.extract(first, variable);
|
||||||
|
if (polynomial) {
|
||||||
|
roots = polynomialNumericRoots(polynomial, range, 20_000);
|
||||||
|
} else {
|
||||||
|
roots = numericRootsOfExpression(first, variable, range);
|
||||||
|
}
|
||||||
|
|
||||||
|
const points: CriticalPoint[] = [];
|
||||||
|
for (const x of roots) {
|
||||||
|
const y = evaluateValue(expression, { [variable]: x });
|
||||||
|
if (y === null || !Number.isFinite(y)) continue;
|
||||||
|
const curvature = evaluateValue(second, { [variable]: x }) ?? 0;
|
||||||
|
let kind: CriticalPointKind;
|
||||||
|
if (curvature > 1e-9) {
|
||||||
|
kind = "minimum";
|
||||||
|
} else if (curvature < -1e-9) {
|
||||||
|
kind = "maximum";
|
||||||
|
} else {
|
||||||
|
// Second-derivative test is inconclusive; look at how the first
|
||||||
|
// derivative behaves either side.
|
||||||
|
const left = evaluateValue(first, { [variable]: x - 1e-4 }) ?? 0;
|
||||||
|
const right = evaluateValue(first, { [variable]: x + 1e-4 }) ?? 0;
|
||||||
|
if (left < 0 && right > 0) kind = "minimum";
|
||||||
|
else if (left > 0 && right < 0) kind = "maximum";
|
||||||
|
else kind = "inflection";
|
||||||
|
}
|
||||||
|
points.push({ x, y, kind });
|
||||||
|
}
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function numericRootsOfExpression(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
range: [number, number],
|
||||||
|
samples = 20_000,
|
||||||
|
): number[] {
|
||||||
|
const [lower, upper] = range;
|
||||||
|
const roots: number[] = [];
|
||||||
|
const step = (upper - lower) / samples;
|
||||||
|
let previousX = lower;
|
||||||
|
let previousY = evaluateValue(expression, { [variable]: previousX });
|
||||||
|
|
||||||
|
for (let index = 1; index <= samples; index++) {
|
||||||
|
const x = lower + index * step;
|
||||||
|
const y = evaluateValue(expression, { [variable]: x });
|
||||||
|
const lastX = previousX;
|
||||||
|
const lastY = previousY;
|
||||||
|
previousX = x;
|
||||||
|
previousY = y;
|
||||||
|
if (y === null || lastY === null) continue;
|
||||||
|
if (Math.sign(lastY) === Math.sign(y)) continue;
|
||||||
|
if (Math.abs(y) >= 1e6 || Math.abs(lastY) >= 1e6) continue;
|
||||||
|
|
||||||
|
let low = lastX;
|
||||||
|
let high = x;
|
||||||
|
for (let iteration = 0; iteration < 60; iteration++) {
|
||||||
|
const mid = (low + high) / 2;
|
||||||
|
const value = evaluateValue(expression, { [variable]: mid });
|
||||||
|
const lowValue = evaluateValue(expression, { [variable]: low });
|
||||||
|
if (value === null || lowValue === null) break;
|
||||||
|
if (value === 0) {
|
||||||
|
low = mid;
|
||||||
|
high = mid;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (Math.sign(value) === Math.sign(lowValue)) {
|
||||||
|
low = mid;
|
||||||
|
} else {
|
||||||
|
high = mid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const root = (low + high) / 2;
|
||||||
|
// Same pole guard as the main solver: verify the residual.
|
||||||
|
const residual = evaluateValue(expression, { [variable]: root });
|
||||||
|
if (residual === null || Math.abs(residual) >= 1e-6) continue;
|
||||||
|
if (!roots.some((existing) => Math.abs(existing - root) < 1e-6)) roots.push(root);
|
||||||
|
}
|
||||||
|
return roots;
|
||||||
|
}
|
||||||
@@ -0,0 +1,591 @@
|
|||||||
|
// Digit expansions of the well-known constants, computed exactly. Computed
|
||||||
|
// rather than tabulated: a hardcoded string of π is a thing nobody can check,
|
||||||
|
// and a single transposed digit would silently shift every position this
|
||||||
|
// feature reports. Everything here comes out of integer arithmetic that can
|
||||||
|
// be re-derived and tested.
|
||||||
|
//
|
||||||
|
// JavaScript's native BigInt supplies the operation set the generators need
|
||||||
|
// (add, subtract, compare, multiply/divide by a small scalar).
|
||||||
|
// The deep paths are async and yield to the event loop periodically — a
|
||||||
|
// multi-minute synchronous grind would freeze the app's whole UI thread.
|
||||||
|
|
||||||
|
export type MathConstantName = "pi" | "e" | "phi" | "sqrt2" | "sqrt3" | "sqrt5";
|
||||||
|
|
||||||
|
export const ALL_CONSTANT_NAMES: readonly MathConstantName[] = ["pi", "e", "phi", "sqrt2", "sqrt3", "sqrt5"];
|
||||||
|
|
||||||
|
export function constantDisplayName(constant: MathConstantName): string {
|
||||||
|
switch (constant) {
|
||||||
|
case "pi":
|
||||||
|
return "π";
|
||||||
|
case "e":
|
||||||
|
return "e";
|
||||||
|
case "phi":
|
||||||
|
return "φ";
|
||||||
|
case "sqrt2":
|
||||||
|
return "√2";
|
||||||
|
case "sqrt3":
|
||||||
|
return "√3";
|
||||||
|
case "sqrt5":
|
||||||
|
return "√5";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function constantSpokenName(constant: MathConstantName): string {
|
||||||
|
switch (constant) {
|
||||||
|
case "pi":
|
||||||
|
return "pi";
|
||||||
|
case "e":
|
||||||
|
return "e";
|
||||||
|
case "phi":
|
||||||
|
return "the golden ratio";
|
||||||
|
case "sqrt2":
|
||||||
|
return "the square root of 2";
|
||||||
|
case "sqrt3":
|
||||||
|
return "the square root of 3";
|
||||||
|
case "sqrt5":
|
||||||
|
return "the square root of 5";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Digits before the decimal point — 1 for all of these. */
|
||||||
|
export const CONSTANT_INTEGER_PART_DIGITS = 1;
|
||||||
|
|
||||||
|
export function constantNamed(text: string): MathConstantName | null {
|
||||||
|
const lowered = text.toLowerCase();
|
||||||
|
if (lowered.includes("golden") || lowered.includes("phi")) return "phi";
|
||||||
|
if (lowered.includes("root of 2") || lowered.includes("root two") || lowered.includes("sqrt2")) {
|
||||||
|
return "sqrt2";
|
||||||
|
}
|
||||||
|
if (lowered.includes("root of 3") || lowered.includes("root three")) return "sqrt3";
|
||||||
|
if (lowered.includes("root of 5") || lowered.includes("root five")) return "sqrt5";
|
||||||
|
// Word-boundary matched, not substring: `includes("pi")` also fires on
|
||||||
|
// "pie", "spin", and "copying", and `=== "e"` only ever matched a
|
||||||
|
// single-character utterance, so "the digits of e" never resolved.
|
||||||
|
if (lowered.includes("π") || hasWord("pi", lowered)) return "pi";
|
||||||
|
if (hasWord("e", lowered) || lowered.includes("euler")) return "e";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function hasWord(word: string, text: string): boolean {
|
||||||
|
return new RegExp(`\\b${word}\\b`).test(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Cancellation and progress
|
||||||
|
|
||||||
|
/** Cooperative cancellation for the long paths. */
|
||||||
|
export type ComputeCancellation = () => boolean;
|
||||||
|
|
||||||
|
export const NEVER_CANCELLED: ComputeCancellation = () => false;
|
||||||
|
|
||||||
|
/** Raised when a long run is cancelled partway. */
|
||||||
|
export class ComputeCancelled extends Error {
|
||||||
|
constructor() {
|
||||||
|
super("Cancelled");
|
||||||
|
this.name = "ComputeCancelled";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ComputeProgress = (fraction: number, stage: string) => void;
|
||||||
|
|
||||||
|
// setTimeout via globalThis so this module needs no platform lib: it runs
|
||||||
|
// under NativeScript's globals in the app and under Node in the tests.
|
||||||
|
const scheduleMacrotask: (callback: () => void) => void = (callback) =>
|
||||||
|
(globalThis as unknown as { setTimeout: (fn: () => void, ms: number) => unknown }).setTimeout(callback, 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Yield to the event loop when the current slice has run long enough. The
|
||||||
|
* generators call this between series terms so a deep run stays cancellable
|
||||||
|
* and the rest of the app keeps painting.
|
||||||
|
*/
|
||||||
|
class Yielder {
|
||||||
|
private lastYieldAt = Date.now();
|
||||||
|
|
||||||
|
async maybeYield(): Promise<void> {
|
||||||
|
if (Date.now() - this.lastYieldAt < 50) return;
|
||||||
|
await new Promise<void>((resolve) => scheduleMacrotask(resolve));
|
||||||
|
this.lastYieldAt = Date.now();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Limits
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How far the on-device generator will go for an ordinary question.
|
||||||
|
*
|
||||||
|
* Machin's formula is O(n²) in the digit count with scalar-only big
|
||||||
|
* arithmetic. 10,000 digits is well under a second and finds any two- or
|
||||||
|
* three-digit run plus most four-digit ones; past this, the wearer opts into
|
||||||
|
* a long run explicitly.
|
||||||
|
*/
|
||||||
|
export const MAXIMUM_COMPUTED_DIGITS = 10_000;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The furthest an opted-in long run will go, however much time the wearer
|
||||||
|
* offers. Not a time limit — the caller has already accepted the wait — but
|
||||||
|
* a memory-and-honesty one: the O(n²) cost puts this at hours on a phone,
|
||||||
|
* past which nobody is still waiting.
|
||||||
|
*/
|
||||||
|
export const MAXIMUM_FEASIBLE_DIGITS = 2_000_000;
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Cache
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The same constant is asked for repeatedly within one session (search, then
|
||||||
|
* context, then a second search), and recomputing 10,000 digits each time
|
||||||
|
* would be pointlessly slow. Grow-only.
|
||||||
|
*/
|
||||||
|
const cache = new Map<MathConstantName, string>();
|
||||||
|
|
||||||
|
function cachedDigits(constant: MathConstantName, atLeast: number): string | null {
|
||||||
|
const cached = cache.get(constant);
|
||||||
|
if (!cached || cached.length < atLeast) return null;
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
|
function storeDigits(constant: MathConstantName, digits: string): void {
|
||||||
|
const existing = cache.get(constant);
|
||||||
|
if (existing && existing.length >= digits.length) return;
|
||||||
|
cache.set(constant, digits);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Public entry points
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fractional digits only — the part after the decimal point, which is what
|
||||||
|
* "position N of π" universally means. Clamped to MAXIMUM_COMPUTED_DIGITS;
|
||||||
|
* the deeper run is a separate call the wearer has to opt into, so no
|
||||||
|
* ordinary caller can accidentally block the app for minutes.
|
||||||
|
*/
|
||||||
|
export function fractionalDigits(constant: MathConstantName, count: number): string | null {
|
||||||
|
const requested = Math.min(Math.max(count, 1), MAXIMUM_COMPUTED_DIGITS);
|
||||||
|
const cached = cachedDigits(constant, requested);
|
||||||
|
if (cached) return cached.slice(0, requested);
|
||||||
|
// The shallow path runs synchronously; at 10k digits it is fast enough that
|
||||||
|
// an async hop would only complicate every caller.
|
||||||
|
const digits = computeSync(constant, requested);
|
||||||
|
if (digits === null) return null;
|
||||||
|
storeDigits(constant, digits);
|
||||||
|
return digits.slice(0, requested);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The opted-in deep run. Cancellable, and reports progress, because a
|
||||||
|
* multi-minute grind with no way out and nothing on screen is
|
||||||
|
* indistinguishable from a hang.
|
||||||
|
*/
|
||||||
|
export async function deepFractionalDigits(
|
||||||
|
constant: MathConstantName,
|
||||||
|
count: number,
|
||||||
|
cancellation: ComputeCancellation = NEVER_CANCELLED,
|
||||||
|
progress: ComputeProgress | null = null,
|
||||||
|
): Promise<string | null> {
|
||||||
|
const requested = Math.min(Math.max(count, 1), MAXIMUM_FEASIBLE_DIGITS);
|
||||||
|
const cached = cachedDigits(constant, requested);
|
||||||
|
if (cached) return cached.slice(0, requested);
|
||||||
|
const digits = await compute(constant, requested, cancellation, progress, new Yielder());
|
||||||
|
if (digits === null) return null;
|
||||||
|
storeDigits(constant, digits);
|
||||||
|
return digits.slice(0, requested);
|
||||||
|
}
|
||||||
|
|
||||||
|
function computeSync(constant: MathConstantName, requested: number): string | null {
|
||||||
|
// A resolved-synchronously wrapper would still be async; instead run the
|
||||||
|
// shared generator with a yielder that never fires (50ms slices cannot
|
||||||
|
// elapse mid-loop when the whole computation is sub-second) by executing
|
||||||
|
// the promise eagerly. The generators only await through Yielder.maybeYield,
|
||||||
|
// which resolves immediately below the time threshold, so the promise
|
||||||
|
// settles synchronously enough — but rather than rely on that, the shallow
|
||||||
|
// path uses the dedicated synchronous variants.
|
||||||
|
return computeCore(constant, requested, NEVER_CANCELLED, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function compute(
|
||||||
|
constant: MathConstantName,
|
||||||
|
requested: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
yielder: Yielder,
|
||||||
|
): Promise<string | null> {
|
||||||
|
return computeCoreAsync(constant, requested, cancellation, progress, yielder);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Core generators
|
||||||
|
//
|
||||||
|
// Each exists in a synchronous and an asynchronous variant sharing the same
|
||||||
|
// arithmetic. The async ones interleave event-loop yields; the sync ones are
|
||||||
|
// used only under MAXIMUM_COMPUTED_DIGITS where the total cost is small.
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Guard digits absorb the truncation error the series accumulates in its
|
||||||
|
* least significant places; without them the last handful of reported digits
|
||||||
|
* are wrong, which for a position-reporting feature is the whole ballgame.
|
||||||
|
*/
|
||||||
|
const GUARD_DIGITS = 20;
|
||||||
|
|
||||||
|
function computeCore(
|
||||||
|
constant: MathConstantName,
|
||||||
|
requested: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
_yielder: null,
|
||||||
|
): string | null {
|
||||||
|
const scale = requested + GUARD_DIGITS;
|
||||||
|
let scaled: bigint;
|
||||||
|
switch (constant) {
|
||||||
|
case "pi":
|
||||||
|
scaled = machinPiSync(scale, cancellation, progress);
|
||||||
|
break;
|
||||||
|
case "e":
|
||||||
|
scaled = eulerESync(scale, cancellation, progress);
|
||||||
|
break;
|
||||||
|
case "phi": {
|
||||||
|
// φ = (1 + √5) / 2
|
||||||
|
const root = integerSquareRootSync(5, scale, cancellation, progress);
|
||||||
|
scaled = (root + powerOfTen(scale)) / 2n;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "sqrt2":
|
||||||
|
scaled = integerSquareRootSync(2, scale, cancellation, progress);
|
||||||
|
break;
|
||||||
|
case "sqrt3":
|
||||||
|
scaled = integerSquareRootSync(3, scale, cancellation, progress);
|
||||||
|
break;
|
||||||
|
case "sqrt5":
|
||||||
|
scaled = integerSquareRootSync(5, scale, cancellation, progress);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return finishDigits(scaled, requested);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function computeCoreAsync(
|
||||||
|
constant: MathConstantName,
|
||||||
|
requested: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
yielder: Yielder,
|
||||||
|
): Promise<string | null> {
|
||||||
|
const scale = requested + GUARD_DIGITS;
|
||||||
|
let scaled: bigint;
|
||||||
|
switch (constant) {
|
||||||
|
case "pi":
|
||||||
|
scaled = await machinPi(scale, cancellation, progress, yielder);
|
||||||
|
break;
|
||||||
|
case "e":
|
||||||
|
scaled = await eulerE(scale, cancellation, progress, yielder);
|
||||||
|
break;
|
||||||
|
case "phi": {
|
||||||
|
const root = await integerSquareRoot(5, scale, cancellation, progress, yielder);
|
||||||
|
scaled = (root + powerOfTen(scale)) / 2n;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "sqrt2":
|
||||||
|
scaled = await integerSquareRoot(2, scale, cancellation, progress, yielder);
|
||||||
|
break;
|
||||||
|
case "sqrt3":
|
||||||
|
scaled = await integerSquareRoot(3, scale, cancellation, progress, yielder);
|
||||||
|
break;
|
||||||
|
case "sqrt5":
|
||||||
|
scaled = await integerSquareRoot(5, scale, cancellation, progress, yielder);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return finishDigits(scaled, requested);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The value is the constant × 10^scale. Strip the integer part, then the
|
||||||
|
* guard digits.
|
||||||
|
*/
|
||||||
|
function finishDigits(scaled: bigint, requested: number): string | null {
|
||||||
|
const text = scaled.toString();
|
||||||
|
if (text.length <= CONSTANT_INTEGER_PART_DIGITS) return null;
|
||||||
|
const fractional = text.slice(CONSTANT_INTEGER_PART_DIGITS);
|
||||||
|
if (fractional.length < requested) return null;
|
||||||
|
const trimmed = fractional.slice(0, fractional.length - GUARD_DIGITS);
|
||||||
|
return trimmed.slice(0, requested);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function powerOfTen(exponent: number): bigint {
|
||||||
|
return 10n ** BigInt(Math.max(0, exponent));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// π — Machin's formula: π = 16·arctan(1/5) − 4·arctan(1/239).
|
||||||
|
//
|
||||||
|
// Chosen over Chudnovsky because it needs only scalar big-integer operations
|
||||||
|
// — no big×big multiply, no big÷big division, no square roots of big values.
|
||||||
|
|
||||||
|
// arctan(1/5) needs log10(239)/log10(5) ≈ 3.4× as many terms as arctan(1/239)
|
||||||
|
// at the same scale, and each term costs the same, so the first phase is
|
||||||
|
// ~77% of the work. Splitting the reported fraction that way keeps the
|
||||||
|
// progress bar honest instead of stalling at half.
|
||||||
|
const MACHIN_FIRST_SHARE = 0.77;
|
||||||
|
|
||||||
|
function machinPiSync(
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
): bigint {
|
||||||
|
const first =
|
||||||
|
arctanReciprocalSync(5, scale, cancellation, (fraction) =>
|
||||||
|
progress?.(fraction * MACHIN_FIRST_SHARE, "π series 1 of 2"),
|
||||||
|
) * 16n;
|
||||||
|
const second =
|
||||||
|
arctanReciprocalSync(239, scale, cancellation, (fraction) =>
|
||||||
|
progress?.(MACHIN_FIRST_SHARE + fraction * (1 - MACHIN_FIRST_SHARE), "π series 2 of 2"),
|
||||||
|
) * 4n;
|
||||||
|
return first - second;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function machinPi(
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
yielder: Yielder,
|
||||||
|
): Promise<bigint> {
|
||||||
|
const first =
|
||||||
|
(await arctanReciprocal(
|
||||||
|
5,
|
||||||
|
scale,
|
||||||
|
cancellation,
|
||||||
|
(fraction) => progress?.(fraction * MACHIN_FIRST_SHARE, "π series 1 of 2"),
|
||||||
|
yielder,
|
||||||
|
)) * 16n;
|
||||||
|
const second =
|
||||||
|
(await arctanReciprocal(
|
||||||
|
239,
|
||||||
|
scale,
|
||||||
|
cancellation,
|
||||||
|
(fraction) => progress?.(MACHIN_FIRST_SHARE + fraction * (1 - MACHIN_FIRST_SHARE), "π series 2 of 2"),
|
||||||
|
yielder,
|
||||||
|
)) * 4n;
|
||||||
|
return first - second;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** arctan(1/x), scaled by 10^scale, by its alternating Taylor series. */
|
||||||
|
function arctanReciprocalSync(
|
||||||
|
x: number,
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ((fraction: number) => void) | null,
|
||||||
|
): bigint {
|
||||||
|
const bigX = BigInt(x);
|
||||||
|
const xSquared = bigX * bigX;
|
||||||
|
let power = powerOfTen(scale) / bigX;
|
||||||
|
let sum = power;
|
||||||
|
let divisor = 3n;
|
||||||
|
let subtractNext = true;
|
||||||
|
|
||||||
|
// Terms shrink by a factor of x² each step, so the series dies after about
|
||||||
|
// scale / (2·log10 x) of them. Known up front, which is what makes a real
|
||||||
|
// fraction possible rather than a spinner.
|
||||||
|
const expectedTerms = Math.max(1, scale / (2 * Math.log10(x)));
|
||||||
|
let iterations = 0;
|
||||||
|
|
||||||
|
while (power !== 0n) {
|
||||||
|
// Checked every term: one closure call is nothing beside a big-integer
|
||||||
|
// division, and the alternative is an uncancellable multi-minute loop.
|
||||||
|
if (cancellation()) throw new ComputeCancelled();
|
||||||
|
|
||||||
|
power /= xSquared;
|
||||||
|
const term = power / divisor;
|
||||||
|
if (term === 0n) break;
|
||||||
|
sum = subtractNext ? sum - term : sum + term;
|
||||||
|
subtractNext = !subtractNext;
|
||||||
|
divisor += 2n;
|
||||||
|
|
||||||
|
iterations += 1;
|
||||||
|
// Throttled: a million progress callbacks would cost more than the
|
||||||
|
// arithmetic they are reporting on.
|
||||||
|
if (progress && iterations % 256 === 0) {
|
||||||
|
progress(Math.min(1, iterations / expectedTerms));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function arctanReciprocal(
|
||||||
|
x: number,
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ((fraction: number) => void) | null,
|
||||||
|
yielder: Yielder,
|
||||||
|
): Promise<bigint> {
|
||||||
|
const bigX = BigInt(x);
|
||||||
|
const xSquared = bigX * bigX;
|
||||||
|
let power = powerOfTen(scale) / bigX;
|
||||||
|
let sum = power;
|
||||||
|
let divisor = 3n;
|
||||||
|
let subtractNext = true;
|
||||||
|
|
||||||
|
const expectedTerms = Math.max(1, scale / (2 * Math.log10(x)));
|
||||||
|
let iterations = 0;
|
||||||
|
|
||||||
|
while (power !== 0n) {
|
||||||
|
if (cancellation()) throw new ComputeCancelled();
|
||||||
|
|
||||||
|
power /= xSquared;
|
||||||
|
const term = power / divisor;
|
||||||
|
if (term === 0n) break;
|
||||||
|
sum = subtractNext ? sum - term : sum + term;
|
||||||
|
subtractNext = !subtractNext;
|
||||||
|
divisor += 2n;
|
||||||
|
|
||||||
|
iterations += 1;
|
||||||
|
if (progress && iterations % 256 === 0) {
|
||||||
|
progress(Math.min(1, iterations / expectedTerms));
|
||||||
|
}
|
||||||
|
if (iterations % 64 === 0) await yielder.maybeYield();
|
||||||
|
}
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// e = Σ 1/k!, scaled. Each term is the previous divided by k, so the whole
|
||||||
|
// series needs only scalar division.
|
||||||
|
|
||||||
|
function eulerESync(
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
): bigint {
|
||||||
|
let term = powerOfTen(scale);
|
||||||
|
let sum = term;
|
||||||
|
let k = 1n;
|
||||||
|
// The term loses log10(k) digits each step; the series ends when the
|
||||||
|
// accumulated loss passes `scale`. Tracking that sum gives a fraction
|
||||||
|
// without needing Stirling's approximation.
|
||||||
|
let digitsShed = 0;
|
||||||
|
let iterations = 0;
|
||||||
|
|
||||||
|
while (term !== 0n) {
|
||||||
|
if (cancellation()) throw new ComputeCancelled();
|
||||||
|
term /= k;
|
||||||
|
sum += term;
|
||||||
|
digitsShed += Math.log10(Number(k));
|
||||||
|
k += 1n;
|
||||||
|
iterations += 1;
|
||||||
|
if (progress && iterations % 256 === 0) {
|
||||||
|
progress(Math.min(1, digitsShed / Math.max(scale, 1)), "e series");
|
||||||
|
}
|
||||||
|
// 10^scale / k! underflows long before this, but a runaway loop is not an
|
||||||
|
// acceptable failure mode.
|
||||||
|
if (k > 1_000_000n) break;
|
||||||
|
}
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function eulerE(
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
yielder: Yielder,
|
||||||
|
): Promise<bigint> {
|
||||||
|
let term = powerOfTen(scale);
|
||||||
|
let sum = term;
|
||||||
|
let k = 1n;
|
||||||
|
let digitsShed = 0;
|
||||||
|
let iterations = 0;
|
||||||
|
|
||||||
|
while (term !== 0n) {
|
||||||
|
if (cancellation()) throw new ComputeCancelled();
|
||||||
|
term /= k;
|
||||||
|
sum += term;
|
||||||
|
digitsShed += Math.log10(Number(k));
|
||||||
|
k += 1n;
|
||||||
|
iterations += 1;
|
||||||
|
if (progress && iterations % 256 === 0) {
|
||||||
|
progress(Math.min(1, digitsShed / Math.max(scale, 1)), "e series");
|
||||||
|
}
|
||||||
|
if (iterations % 64 === 0) await yielder.maybeYield();
|
||||||
|
if (k > 1_000_000n) break;
|
||||||
|
}
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Square roots — ⌊√(value · 10^(2·scale))⌋, i.e. √value scaled by 10^scale.
|
||||||
|
//
|
||||||
|
// Digit-by-digit ("long division") extraction, which needs only add,
|
||||||
|
// subtract, compare, and multiply-by-scalar.
|
||||||
|
|
||||||
|
function integerSquareRootSync(
|
||||||
|
value: number,
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
): bigint {
|
||||||
|
// Work in pairs of decimal digits, which is what the algorithm consumes.
|
||||||
|
const totalPairs = scale + 1;
|
||||||
|
let remainder = 0n;
|
||||||
|
let root = 0n;
|
||||||
|
|
||||||
|
for (let pairIndex = 0; pairIndex < totalPairs; pairIndex++) {
|
||||||
|
if (cancellation()) throw new ComputeCancelled();
|
||||||
|
if (progress && pairIndex % 256 === 0) {
|
||||||
|
progress(pairIndex / totalPairs, "root extraction");
|
||||||
|
}
|
||||||
|
// Bring down the next two digits: the first pair is the integer part,
|
||||||
|
// every later pair is zero because the radicand's fractional expansion is
|
||||||
|
// all zeros.
|
||||||
|
const bringDown = pairIndex === 0 ? BigInt(value) : 0n;
|
||||||
|
remainder = remainder * 100n + bringDown;
|
||||||
|
|
||||||
|
// Find the largest d in 0...9 with (20·root + d)·d ≤ remainder.
|
||||||
|
const twentyRoot = root * 20n;
|
||||||
|
let chosen = 0n;
|
||||||
|
let chosenProduct = 0n;
|
||||||
|
for (let digit = 9n; digit >= 1n; digit--) {
|
||||||
|
const candidate = (twentyRoot + digit) * digit;
|
||||||
|
if (candidate <= remainder) {
|
||||||
|
chosen = digit;
|
||||||
|
chosenProduct = candidate;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
remainder -= chosenProduct;
|
||||||
|
root = root * 10n + chosen;
|
||||||
|
}
|
||||||
|
return root;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function integerSquareRoot(
|
||||||
|
value: number,
|
||||||
|
scale: number,
|
||||||
|
cancellation: ComputeCancellation,
|
||||||
|
progress: ComputeProgress | null,
|
||||||
|
yielder: Yielder,
|
||||||
|
): Promise<bigint> {
|
||||||
|
const totalPairs = scale + 1;
|
||||||
|
let remainder = 0n;
|
||||||
|
let root = 0n;
|
||||||
|
|
||||||
|
for (let pairIndex = 0; pairIndex < totalPairs; pairIndex++) {
|
||||||
|
if (cancellation()) throw new ComputeCancelled();
|
||||||
|
if (progress && pairIndex % 256 === 0) {
|
||||||
|
progress(pairIndex / totalPairs, "root extraction");
|
||||||
|
}
|
||||||
|
const bringDown = pairIndex === 0 ? BigInt(value) : 0n;
|
||||||
|
remainder = remainder * 100n + bringDown;
|
||||||
|
|
||||||
|
const twentyRoot = root * 20n;
|
||||||
|
let chosen = 0n;
|
||||||
|
let chosenProduct = 0n;
|
||||||
|
for (let digit = 9n; digit >= 1n; digit--) {
|
||||||
|
const candidate = (twentyRoot + digit) * digit;
|
||||||
|
if (candidate <= remainder) {
|
||||||
|
chosen = digit;
|
||||||
|
chosenProduct = candidate;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
remainder -= chosenProduct;
|
||||||
|
root = root * 10n + chosen;
|
||||||
|
if (pairIndex % 64 === 0) await yielder.maybeYield();
|
||||||
|
}
|
||||||
|
return root;
|
||||||
|
}
|
||||||
@@ -0,0 +1,602 @@
|
|||||||
|
// Owns the one live maths problem and everything derived from it. Shared
|
||||||
|
// state rather than per-request because the whole point of "graph it" and
|
||||||
|
// "explain it" is that they refer to the problem already on the lens; a
|
||||||
|
// caller that re-parsed its own capture each time would make those
|
||||||
|
// follow-ups impossible.
|
||||||
|
//
|
||||||
|
// Deep digit work runs on the phone as an explicit, cancellable long run
|
||||||
|
// the wearer opts into. The
|
||||||
|
// optional AI pass is injected as a hook so this module stays free of any
|
||||||
|
// networking and testable in plain Node.
|
||||||
|
|
||||||
|
import { type MathConstantName, ComputeCancelled, constantDisplayName, constantNamed } from "./constant-digits";
|
||||||
|
import { highlightedMatch } from "./digit-search";
|
||||||
|
import { formatInt } from "./math-number";
|
||||||
|
import {
|
||||||
|
type LongRunOffer,
|
||||||
|
type LongRunProgress,
|
||||||
|
type MathWorkload,
|
||||||
|
compactDuration,
|
||||||
|
longRunOffer as makeLongRunOffer,
|
||||||
|
runAcceptedCount,
|
||||||
|
runAcceptedDigits,
|
||||||
|
runAcceptedSearch,
|
||||||
|
} from "./workload";
|
||||||
|
import { type MathSessionResult, MathSession, parseCommand } from "./session";
|
||||||
|
import { type Graph } from "./plotter";
|
||||||
|
import { type SolutionStep } from "./solver";
|
||||||
|
import { plain } from "./text-renderer";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Branch outcome
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A branch result. The value/failure split matters: a parse error must never
|
||||||
|
* be posted onward as if it were the answer.
|
||||||
|
*/
|
||||||
|
export type MathBranchOutcome =
|
||||||
|
| { kind: "value"; text: string }
|
||||||
|
| { kind: "failure"; reason: string };
|
||||||
|
|
||||||
|
export type MathBranchMode = "solve" | "explain" | "graph" | "derivative" | "digitSearch" | "digitCount";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The app's uniform gesture contract: forward/back step through the
|
||||||
|
* working, commit
|
||||||
|
* graphs, alternate explains, exit clears.
|
||||||
|
*/
|
||||||
|
export type RingAction = "forward" | "back" | "commit" | "alternate" | "exit";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ask the configured assistant to render a spoken problem as an expression
|
||||||
|
* (the prompt text lives in app/prompts.ts with every other prompt).
|
||||||
|
* Injected by the app; null when no provider is configured. Resolves to the
|
||||||
|
* model's raw reply, or null on failure — the coordinator sanitises it.
|
||||||
|
*/
|
||||||
|
export type AICompletion = (spokenText: string) => Promise<string | null>;
|
||||||
|
|
||||||
|
export class MathCoordinator {
|
||||||
|
/** The last thing produced, for the answer view. */
|
||||||
|
lastResult: MathSessionResult | null = null;
|
||||||
|
lastGraph: Graph | null = null;
|
||||||
|
/** Position in the working, for the step indicator. */
|
||||||
|
stepPosition: { index: number; total: number } | null = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A standing offer to grind the full-depth answer out on the phone.
|
||||||
|
* Non-null means every surface should be offering it.
|
||||||
|
*/
|
||||||
|
pendingLongRun: LongRunOffer | null = null;
|
||||||
|
/** Live progress while an accepted run is going. Null when nothing is running. */
|
||||||
|
longRunProgress: LongRunProgress | null = null;
|
||||||
|
/**
|
||||||
|
* The answer a deeper pass produced. One channel, because from the
|
||||||
|
* wearer's side it is one event: the better answer arrived.
|
||||||
|
*/
|
||||||
|
deepAnswer: MathBranchOutcome | null = null;
|
||||||
|
|
||||||
|
/** Repaint hook, set by the owning layer. */
|
||||||
|
onChanged: (() => void) | null = null;
|
||||||
|
|
||||||
|
private readonly session = new MathSession();
|
||||||
|
private completeWithAI: AICompletion | null = null;
|
||||||
|
private longRunCancelled = false;
|
||||||
|
private longRunRunning = false;
|
||||||
|
private longRunStartedAtMs = 0;
|
||||||
|
|
||||||
|
get hasProblem(): boolean {
|
||||||
|
return this.session.hasProblem;
|
||||||
|
}
|
||||||
|
|
||||||
|
get currentSolution() {
|
||||||
|
return this.session.currentSolution;
|
||||||
|
}
|
||||||
|
|
||||||
|
get explanationSteps(): SolutionStep[] {
|
||||||
|
return this.session.currentSolution?.steps ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
get isRunningLong(): boolean {
|
||||||
|
return this.longRunRunning;
|
||||||
|
}
|
||||||
|
|
||||||
|
setUsesDegrees(value: boolean): void {
|
||||||
|
this.session.setUsesDegrees(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
setAICompletion(completion: AICompletion | null): void {
|
||||||
|
this.completeWithAI = completion;
|
||||||
|
}
|
||||||
|
|
||||||
|
private changed(): void {
|
||||||
|
this.onChanged?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Branch execution
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run one branch. Returns the glasses text, or a failure string — the
|
||||||
|
* caller distinguishes them.
|
||||||
|
*/
|
||||||
|
run(mode: MathBranchMode, input: string): MathBranchOutcome {
|
||||||
|
const trimmed = input.trim();
|
||||||
|
|
||||||
|
let sessionResult: MathSessionResult;
|
||||||
|
switch (mode) {
|
||||||
|
case "solve":
|
||||||
|
// "Solve it" after Graph/Explain means show the standing answer
|
||||||
|
// again. Requiring fresh input here made the third follow-up mode
|
||||||
|
// uniquely fail.
|
||||||
|
if (!trimmed && this.session.hasProblem) {
|
||||||
|
sessionResult = this.session.execute({ kind: "restate" });
|
||||||
|
} else if (!trimmed) {
|
||||||
|
return { kind: "failure", reason: "Nothing was captured to solve" };
|
||||||
|
} else {
|
||||||
|
sessionResult = this.session.solve(trimmed);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "graph":
|
||||||
|
// A graph branch may fire with a fresh capture ("graph x squared") or
|
||||||
|
// as a follow-up on the standing problem ("graph it"). Both have to
|
||||||
|
// work from the same branch.
|
||||||
|
if (trimmed && (parseCommand(trimmed) === null || this.isProblem(trimmed))) {
|
||||||
|
this.session.solve(trimmed);
|
||||||
|
}
|
||||||
|
sessionResult = this.session.graph();
|
||||||
|
break;
|
||||||
|
case "explain":
|
||||||
|
if (trimmed && this.isProblem(trimmed)) this.session.solve(trimmed);
|
||||||
|
sessionResult = this.session.explain();
|
||||||
|
break;
|
||||||
|
case "derivative":
|
||||||
|
if (trimmed && this.isProblem(trimmed)) this.session.solve(trimmed);
|
||||||
|
sessionResult = this.session.differentiate(null);
|
||||||
|
break;
|
||||||
|
case "digitSearch":
|
||||||
|
case "digitCount": {
|
||||||
|
const digits = MathCoordinator.digitRun(trimmed);
|
||||||
|
if (!digits) return { kind: "failure", reason: "No digits were captured to look for" };
|
||||||
|
// The constant is read from the capture when the wearer named one
|
||||||
|
// ("…in the golden ratio") and is π otherwise.
|
||||||
|
const constant: MathConstantName = constantNamed(trimmed) ?? "pi";
|
||||||
|
sessionResult = this.session.execute({
|
||||||
|
kind: "advanced",
|
||||||
|
topic:
|
||||||
|
mode === "digitCount"
|
||||||
|
? { kind: "digitCount", pattern: digits, constant }
|
||||||
|
: { kind: "digitSearch", pattern: digits, constant, occurrence: 1 },
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.publish(sessionResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every digit in the capture, in order, with the separators dropped.
|
||||||
|
*
|
||||||
|
* Joined rather than "the first run" because ASR punctuates a spoken date
|
||||||
|
* freely — "07 04 84", "070484", "7/4/84" are all the same six digits —
|
||||||
|
* and taking the first run would search π for "07", which appears within
|
||||||
|
* the first dozen places and looks for all the world like a working
|
||||||
|
* answer.
|
||||||
|
*/
|
||||||
|
static digitRun(text: string): string | null {
|
||||||
|
const joined = text.replace(/\D/g, "");
|
||||||
|
return joined ? joined : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private isProblem(text: string): boolean {
|
||||||
|
return parseCommand(text)?.kind === "problem";
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Spoken questions
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Answer a question stated in words, whatever shape it arrived in.
|
||||||
|
*
|
||||||
|
* Two passes, in this order and never the other way round:
|
||||||
|
*
|
||||||
|
* 1. The deterministic engine alone. The spoken normaliser already turns
|
||||||
|
* "two x squared plus three x" into `2x²+3x`, and every answer it gives
|
||||||
|
* is exact.
|
||||||
|
* 2. Only if that fails to parse, ask the model to REWRITE the words as an
|
||||||
|
* expression — and then solve that expression here, deterministically.
|
||||||
|
*
|
||||||
|
* The model never computes anything. It is used as a translator from
|
||||||
|
* English into notation, which is the part it is genuinely good at and the
|
||||||
|
* part where a mistake is visible: the rewritten expression is returned
|
||||||
|
* alongside the answer, so a wrong reading shows up as a wrong-looking
|
||||||
|
* equation rather than as a plausible wrong number.
|
||||||
|
*/
|
||||||
|
async answerSpoken(text: string): Promise<MathBranchOutcome> {
|
||||||
|
const trimmed = text.trim();
|
||||||
|
if (!trimmed) return { kind: "failure", reason: "Nothing was said to calculate" };
|
||||||
|
|
||||||
|
const command = parseCommand(trimmed);
|
||||||
|
if (command) {
|
||||||
|
const outcome = this.publish(this.session.execute(command));
|
||||||
|
if (outcome.kind === "value") return outcome;
|
||||||
|
// A FOLLOW-UP that failed keeps its own message. "Graph it" with
|
||||||
|
// nothing on the lens fails because there is nothing to graph, and
|
||||||
|
// handing those two words to a rewriter would replace that with "could
|
||||||
|
// not read that as a calculation" — true of the words, and useless
|
||||||
|
// about the actual problem.
|
||||||
|
if (command.kind !== "problem") return outcome;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rewritten = await this.expressionFromAI(trimmed);
|
||||||
|
if (!rewritten) {
|
||||||
|
return { kind: "failure", reason: "Could not read that as a calculation" };
|
||||||
|
}
|
||||||
|
const outcome = this.publish(this.session.solve(rewritten));
|
||||||
|
if (outcome.kind !== "value") return outcome;
|
||||||
|
// Show the reading, not just the result. A wearer glancing at the lens
|
||||||
|
// has to be able to see that the machine understood the right question
|
||||||
|
// before they repeat the number.
|
||||||
|
return { kind: "value", text: `${rewritten}\n${outcome.text}` };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ask the configured assistant to render a spoken problem as an
|
||||||
|
* expression. Returns null when no provider is configured, when it
|
||||||
|
* declines, or when it answers with anything that is not one.
|
||||||
|
*/
|
||||||
|
private async expressionFromAI(text: string): Promise<string | null> {
|
||||||
|
if (!this.completeWithAI) return null;
|
||||||
|
let raw: string | null;
|
||||||
|
try {
|
||||||
|
raw = await this.completeWithAI(text);
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (!raw) return null;
|
||||||
|
|
||||||
|
let candidate = raw.trim();
|
||||||
|
// Models fence notation out of habit even when told not to.
|
||||||
|
if (candidate.startsWith("```")) {
|
||||||
|
candidate = candidate
|
||||||
|
.split("\n")
|
||||||
|
.filter((line) => !line.startsWith("```"))
|
||||||
|
.join(" ")
|
||||||
|
.trim();
|
||||||
|
}
|
||||||
|
candidate = candidate.replace(/^[ `.,]+|[ `.,]+$/g, "");
|
||||||
|
|
||||||
|
if (!candidate || candidate.toLowerCase() === "none") return null;
|
||||||
|
// A refusal or an apology is prose, and prose fed to the parser fails in
|
||||||
|
// a way that reads like the maths was wrong rather than the routing.
|
||||||
|
if (candidate.length > 120) return null;
|
||||||
|
if (!/[+\-*/^=\d]/.test(candidate)) return null;
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Voice follow-ups
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle a spoken follow-up. Returns null when the utterance is not a
|
||||||
|
* maths command, so ordinary conversation flows past untouched — this is
|
||||||
|
* called from the transcript stream, which sees everything said in the
|
||||||
|
* room in continuous mode.
|
||||||
|
*/
|
||||||
|
handleUtterance(utterance: string): MathBranchOutcome | null {
|
||||||
|
// A standing offer or a run in flight owns the next yes/no said in the
|
||||||
|
// room. Checked before the maths parser, because "keep going" is not an
|
||||||
|
// equation and would otherwise fall straight through.
|
||||||
|
const longRunAnswer = this.handleLongRunUtterance(utterance);
|
||||||
|
if (longRunAnswer) return longRunAnswer;
|
||||||
|
|
||||||
|
const command = parseCommand(utterance);
|
||||||
|
if (!command) return null;
|
||||||
|
// A bare problem with no standing session is a new problem; a follow-up
|
||||||
|
// with no session is a no-op rather than an error card in mid-air.
|
||||||
|
if (command.kind !== "problem" && command.kind !== "advanced" && !this.session.hasProblem) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return this.publish(this.session.execute(command));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Accept or decline a long run by voice. Only fires while an offer stands
|
||||||
|
* or a run is going, so these phrases stay out of the way of ordinary
|
||||||
|
* conversation the rest of the time.
|
||||||
|
*/
|
||||||
|
handleLongRunUtterance(utterance: string): MathBranchOutcome | null {
|
||||||
|
const text = utterance.toLowerCase();
|
||||||
|
|
||||||
|
if (this.longRunRunning) {
|
||||||
|
if (!STOP_PHRASES.some((phrase) => text.includes(phrase))) return null;
|
||||||
|
this.cancelLongRun();
|
||||||
|
return { kind: "failure", reason: "Stopping" };
|
||||||
|
}
|
||||||
|
|
||||||
|
const offer = this.pendingLongRun;
|
||||||
|
if (!offer) return null;
|
||||||
|
if (ACCEPT_PHRASES.some((phrase) => text.includes(phrase))) {
|
||||||
|
void this.acceptLongRun();
|
||||||
|
return { kind: "value", text: `Working — ${compactDuration(offer.estimatedSeconds)}` };
|
||||||
|
}
|
||||||
|
if (DECLINE_PHRASES.some((phrase) => text.includes(phrase))) {
|
||||||
|
this.declineLongRun();
|
||||||
|
return { kind: "failure", reason: "Left it there" };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
get hasLongRunInteraction(): boolean {
|
||||||
|
return this.pendingLongRun !== null || this.longRunRunning;
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Uniform gesture contract
|
||||||
|
|
||||||
|
handleRingAction(action: RingAction): MathBranchOutcome | null {
|
||||||
|
// The offer and the running job both pre-empt the step navigation: while
|
||||||
|
// either is on screen, the input is answering that question and nothing
|
||||||
|
// else. Same gestures, no new vocabulary.
|
||||||
|
if (this.longRunRunning) {
|
||||||
|
if (action !== "exit") return null;
|
||||||
|
this.cancelLongRun();
|
||||||
|
return { kind: "failure", reason: "Stopping" };
|
||||||
|
}
|
||||||
|
const offer = this.pendingLongRun;
|
||||||
|
if (offer) {
|
||||||
|
switch (action) {
|
||||||
|
case "commit":
|
||||||
|
void this.acceptLongRun();
|
||||||
|
return { kind: "value", text: `Working — ${compactDuration(offer.estimatedSeconds)}` };
|
||||||
|
case "exit":
|
||||||
|
this.declineLongRun();
|
||||||
|
return { kind: "failure", reason: "Left it there" };
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.session.hasProblem) return null;
|
||||||
|
switch (action) {
|
||||||
|
case "forward":
|
||||||
|
return this.publish(this.session.execute({ kind: "nextStep" }));
|
||||||
|
case "back":
|
||||||
|
return this.publish(this.session.execute({ kind: "previousStep" }));
|
||||||
|
case "commit":
|
||||||
|
return this.publish(this.session.graph());
|
||||||
|
case "alternate":
|
||||||
|
return this.publish(this.session.explain());
|
||||||
|
case "exit":
|
||||||
|
return this.publish(this.session.execute({ kind: "clear" }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Long runs
|
||||||
|
|
||||||
|
/** Take the standing offer. Returns false when there was nothing to accept. */
|
||||||
|
acceptLongRun(): boolean {
|
||||||
|
const offer = this.pendingLongRun;
|
||||||
|
if (!offer || this.longRunRunning) return false;
|
||||||
|
this.pendingLongRun = null;
|
||||||
|
this.deepAnswer = null;
|
||||||
|
this.longRunCancelled = false;
|
||||||
|
this.longRunRunning = true;
|
||||||
|
this.longRunStartedAtMs = Date.now();
|
||||||
|
this.longRunProgress = { fraction: 0, stage: "starting", elapsedSeconds: 0 };
|
||||||
|
this.changed();
|
||||||
|
|
||||||
|
const cancellation = () => this.longRunCancelled;
|
||||||
|
const progress = (fraction: number, stage: string) => {
|
||||||
|
this.longRunProgress = {
|
||||||
|
fraction,
|
||||||
|
stage,
|
||||||
|
elapsedSeconds: (Date.now() - this.longRunStartedAtMs) / 1000,
|
||||||
|
};
|
||||||
|
this.changed();
|
||||||
|
};
|
||||||
|
|
||||||
|
void (async () => {
|
||||||
|
let outcome: MathBranchOutcome;
|
||||||
|
try {
|
||||||
|
switch (offer.workload.kind) {
|
||||||
|
case "digitSearch": {
|
||||||
|
const found = await runAcceptedSearch(offer, cancellation, progress);
|
||||||
|
outcome = describeDeepSearch(found, offer.workload.pattern, offer.workload.constant);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "constantDigits": {
|
||||||
|
const digits = await runAcceptedDigits(offer, cancellation, progress);
|
||||||
|
outcome = digits
|
||||||
|
? {
|
||||||
|
kind: "value",
|
||||||
|
text: `${constantDisplayName(offer.workload.constant)}: ${formatInt(digits.length)} digits ready`,
|
||||||
|
}
|
||||||
|
: { kind: "failure", reason: "Could not generate that many digits" };
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case "digitCount": {
|
||||||
|
const counted = await runAcceptedCount(offer, cancellation, progress);
|
||||||
|
outcome = {
|
||||||
|
kind: "value",
|
||||||
|
text: describeCount(counted.occurrences, counted.searchedDigits, offer.workload.pattern, offer.workload.constant),
|
||||||
|
};
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
outcome =
|
||||||
|
error instanceof ComputeCancelled
|
||||||
|
? { kind: "failure", reason: "Stopped" }
|
||||||
|
: { kind: "failure", reason: String((error as Error)?.message ?? error) };
|
||||||
|
}
|
||||||
|
this.longRunRunning = false;
|
||||||
|
this.longRunProgress = null;
|
||||||
|
this.deepAnswer = outcome;
|
||||||
|
this.changed();
|
||||||
|
})();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Turn the offer down. The shallow answer already given stands. */
|
||||||
|
declineLongRun(): void {
|
||||||
|
this.pendingLongRun = null;
|
||||||
|
this.changed();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stop a run in flight. The digits computed so far are discarded — a
|
||||||
|
* partial expansion cannot answer a position question.
|
||||||
|
*/
|
||||||
|
cancelLongRun(): void {
|
||||||
|
this.longRunCancelled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Publishing
|
||||||
|
|
||||||
|
private publish(sessionResult: MathSessionResult): MathBranchOutcome {
|
||||||
|
this.lastResult = sessionResult;
|
||||||
|
|
||||||
|
// The shallow answer goes out immediately; anything better arrives on
|
||||||
|
// `deepAnswer` if the wearer accepts the standing offer. Never block the
|
||||||
|
// first response on the second — silence is worse than a partial.
|
||||||
|
if (sessionResult.unresolvedWorkload) {
|
||||||
|
this.pendingLongRun = makeLongRunOffer(
|
||||||
|
sessionResult.unresolvedWorkload,
|
||||||
|
"Needs a deeper expansion than the fast pass holds",
|
||||||
|
shallowDescription(sessionResult.unresolvedWorkload, sessionResult),
|
||||||
|
);
|
||||||
|
this.deepAnswer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (sessionResult.payload.kind) {
|
||||||
|
case "graph":
|
||||||
|
this.lastGraph = sessionResult.payload.graph;
|
||||||
|
this.stepPosition = null;
|
||||||
|
break;
|
||||||
|
case "step":
|
||||||
|
this.lastGraph = null;
|
||||||
|
this.stepPosition = { index: sessionResult.payload.index, total: sessionResult.payload.total };
|
||||||
|
break;
|
||||||
|
case "solution":
|
||||||
|
case "message":
|
||||||
|
case "topic":
|
||||||
|
this.lastGraph = null;
|
||||||
|
// An advanced topic answers in one shot — there is no working to step
|
||||||
|
// through, so the step indicator must clear.
|
||||||
|
this.stepPosition = null;
|
||||||
|
break;
|
||||||
|
case "failure":
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
this.changed();
|
||||||
|
|
||||||
|
if (sessionResult.payload.kind === "failure") {
|
||||||
|
return { kind: "failure", reason: sessionResult.payload.message };
|
||||||
|
}
|
||||||
|
return { kind: "value", text: this.glassesText(sessionResult) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Two or three short rows. The lens has no room for the detail sentence,
|
||||||
|
* which is why `detail` stays in the fuller answer view.
|
||||||
|
*/
|
||||||
|
private glassesText(sessionResult: MathSessionResult): string {
|
||||||
|
switch (sessionResult.payload.kind) {
|
||||||
|
case "step": {
|
||||||
|
const payload = sessionResult.payload;
|
||||||
|
return `${payload.index + 1}/${payload.total} ${payload.step.title}\n${plain(payload.step.expression)}`;
|
||||||
|
}
|
||||||
|
case "graph":
|
||||||
|
// The bitmap carries the picture; this is the text fallback.
|
||||||
|
return sessionResult.headline;
|
||||||
|
case "topic": {
|
||||||
|
// Two field rows at most: the window is short and the headline
|
||||||
|
// already took a line.
|
||||||
|
const payload = sessionResult.payload;
|
||||||
|
return [payload.headline, ...payload.fields.slice(0, 2)].join("\n");
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return sessionResult.headline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Long-run phrases
|
||||||
|
|
||||||
|
const ACCEPT_PHRASES = [
|
||||||
|
"keep going",
|
||||||
|
"run it anyway",
|
||||||
|
"run it any way",
|
||||||
|
"take your time",
|
||||||
|
"go deeper",
|
||||||
|
"keep looking",
|
||||||
|
"do it anyway",
|
||||||
|
"yes go on",
|
||||||
|
];
|
||||||
|
|
||||||
|
const DECLINE_PHRASES = [
|
||||||
|
"never mind",
|
||||||
|
"nevermind",
|
||||||
|
"forget it",
|
||||||
|
"leave it",
|
||||||
|
"don't bother",
|
||||||
|
"do not bother",
|
||||||
|
"skip it",
|
||||||
|
];
|
||||||
|
|
||||||
|
const STOP_PHRASES = ["stop", "cancel", "give up", "that's enough", "thats enough"];
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Descriptions
|
||||||
|
|
||||||
|
function describeDeepSearch(
|
||||||
|
outcome: Awaited<ReturnType<typeof runAcceptedSearch>>,
|
||||||
|
pattern: string,
|
||||||
|
constant: MathConstantName,
|
||||||
|
): MathBranchOutcome {
|
||||||
|
switch (outcome.kind) {
|
||||||
|
case "found":
|
||||||
|
return {
|
||||||
|
kind: "value",
|
||||||
|
text:
|
||||||
|
`${constantDisplayName(constant)}: places ${outcome.match.start}–${outcome.match.end}\n` +
|
||||||
|
`…${highlightedMatch(outcome.match)}…`,
|
||||||
|
};
|
||||||
|
case "notFound":
|
||||||
|
// Now a much stronger claim than the shallow pass could make, so it is
|
||||||
|
// worth stating the depth that was actually reached.
|
||||||
|
return {
|
||||||
|
kind: "failure",
|
||||||
|
reason:
|
||||||
|
`${pattern} is not in the first ${formatInt(outcome.searchedDigits)} digits ` +
|
||||||
|
`of ${constantDisplayName(constant)}`,
|
||||||
|
};
|
||||||
|
case "invalidPattern":
|
||||||
|
return { kind: "failure", reason: outcome.reason };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function describeCount(
|
||||||
|
occurrences: number,
|
||||||
|
searchedDigits: number,
|
||||||
|
pattern: string,
|
||||||
|
constant: MathConstantName,
|
||||||
|
): string {
|
||||||
|
const times = occurrences === 1 ? "time" : "times";
|
||||||
|
return `${pattern}: ${occurrences} ${times}\nfirst ${formatInt(searchedDigits)} digits of ${constantDisplayName(constant)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function shallowDescription(workload: MathWorkload, sessionResult: MathSessionResult): string | null {
|
||||||
|
switch (workload.kind) {
|
||||||
|
case "digitSearch":
|
||||||
|
return sessionResult.headline;
|
||||||
|
case "digitCount":
|
||||||
|
return sessionResult.headline;
|
||||||
|
case "constantDigits":
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,234 @@
|
|||||||
|
// Symbolic differentiation. Every rule is applied structurally and the result
|
||||||
|
// is handed to the simplifier, so `d/dx (x^2)` comes back as `2x` rather than
|
||||||
|
// `2 · x^(2-1) · 1`. That matters because the derivative is user-visible — it
|
||||||
|
// is what "explain it" shows.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
type MathFunction,
|
||||||
|
ONE,
|
||||||
|
ZERO,
|
||||||
|
addExpr,
|
||||||
|
divideExpr,
|
||||||
|
fn,
|
||||||
|
int,
|
||||||
|
multiplyExpr,
|
||||||
|
negate,
|
||||||
|
powerExpr,
|
||||||
|
relation,
|
||||||
|
subtractExpr,
|
||||||
|
variablesOf,
|
||||||
|
} from "./expression";
|
||||||
|
import { simplify } from "./simplifier";
|
||||||
|
import { evaluateValue } from "./evaluator";
|
||||||
|
|
||||||
|
export function differentiate(expression: MathExpression, withRespectTo: string): MathExpression {
|
||||||
|
return simplify(raw(expression, withRespectTo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Nth derivative. */
|
||||||
|
export function differentiateOrder(
|
||||||
|
expression: MathExpression,
|
||||||
|
withRespectTo: string,
|
||||||
|
order: number,
|
||||||
|
): MathExpression {
|
||||||
|
let current = expression;
|
||||||
|
for (let step = 0; step < Math.max(0, order); step++) {
|
||||||
|
current = differentiate(current, withRespectTo);
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
|
function raw(expression: MathExpression, variable: string): MathExpression {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number":
|
||||||
|
case "constant":
|
||||||
|
return ZERO;
|
||||||
|
|
||||||
|
case "variable":
|
||||||
|
return expression.name === variable ? ONE : ZERO;
|
||||||
|
|
||||||
|
case "negate":
|
||||||
|
return negate(raw(expression.inner, variable));
|
||||||
|
|
||||||
|
case "add":
|
||||||
|
return addExpr(expression.terms.map((term) => raw(term, variable)));
|
||||||
|
|
||||||
|
case "multiply": {
|
||||||
|
// Product rule, generalised: d(abc) = a'bc + ab'c + abc'.
|
||||||
|
const terms: MathExpression[] = [];
|
||||||
|
for (let index = 0; index < expression.factors.length; index++) {
|
||||||
|
const replaced = [...expression.factors];
|
||||||
|
replaced[index] = raw(expression.factors[index]!, variable);
|
||||||
|
terms.push(multiplyExpr(replaced));
|
||||||
|
}
|
||||||
|
return addExpr(terms);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "power":
|
||||||
|
return differentiatePower(expression.base, expression.exponent, variable);
|
||||||
|
|
||||||
|
case "function": {
|
||||||
|
const argument = expression.args[0];
|
||||||
|
if (!argument) return ZERO;
|
||||||
|
const outer = derivativeOfFunction(expression.fn, argument);
|
||||||
|
// Chain rule. Skipping this when the argument is the bare variable
|
||||||
|
// would be a needless special case — the simplifier removes the `· 1`
|
||||||
|
// anyway.
|
||||||
|
return multiplyExpr([outer, raw(argument, variable)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "relation":
|
||||||
|
// Differentiating both sides of an equation is implicit
|
||||||
|
// differentiation's first step; useful, and harmless here.
|
||||||
|
return relation(expression.relation, raw(expression.lhs, variable), raw(expression.rhs, variable));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function differentiatePower(
|
||||||
|
base: MathExpression,
|
||||||
|
exponent: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
): MathExpression {
|
||||||
|
const baseHasVariable = variablesOf(base).includes(variable);
|
||||||
|
const exponentHasVariable = variablesOf(exponent).includes(variable);
|
||||||
|
|
||||||
|
if (!baseHasVariable && !exponentHasVariable) return ZERO;
|
||||||
|
|
||||||
|
if (baseHasVariable && !exponentHasVariable) {
|
||||||
|
// Power rule: d(u^n) = n · u^(n-1) · u'
|
||||||
|
const reduced = subtractExpr(exponent, ONE);
|
||||||
|
return multiplyExpr([exponent, powerExpr(base, reduced), raw(base, variable)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!baseHasVariable && exponentHasVariable) {
|
||||||
|
// Exponential rule: d(a^v) = a^v · ln(a) · v'
|
||||||
|
return multiplyExpr([powerExpr(base, exponent), fn("ln", [base]), raw(exponent, variable)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// General case via logarithmic differentiation:
|
||||||
|
// d(u^v) = u^v · (v' · ln u + v · u'/u)
|
||||||
|
const uv = powerExpr(base, exponent);
|
||||||
|
const firstTerm = multiplyExpr([raw(exponent, variable), fn("ln", [base])]);
|
||||||
|
const secondTerm = multiplyExpr([exponent, divideExpr(raw(base, variable), base)]);
|
||||||
|
return multiplyExpr([uv, addExpr([firstTerm, secondTerm])]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The outer derivative only; the caller applies the chain rule. */
|
||||||
|
function derivativeOfFunction(name: MathFunction, argument: MathExpression): MathExpression {
|
||||||
|
switch (name) {
|
||||||
|
case "sin":
|
||||||
|
return fn("cos", [argument]);
|
||||||
|
case "cos":
|
||||||
|
return negate(fn("sin", [argument]));
|
||||||
|
case "tan":
|
||||||
|
// sec² = 1 / cos²
|
||||||
|
return divideExpr(ONE, powerExpr(fn("cos", [argument]), int(2)));
|
||||||
|
case "asin":
|
||||||
|
return divideExpr(ONE, fn("sqrt", [subtractExpr(ONE, powerExpr(argument, int(2)))]));
|
||||||
|
case "acos":
|
||||||
|
return negate(divideExpr(ONE, fn("sqrt", [subtractExpr(ONE, powerExpr(argument, int(2)))])));
|
||||||
|
case "atan":
|
||||||
|
return divideExpr(ONE, addExpr([ONE, powerExpr(argument, int(2))]));
|
||||||
|
case "sinh":
|
||||||
|
return fn("cosh", [argument]);
|
||||||
|
case "cosh":
|
||||||
|
return fn("sinh", [argument]);
|
||||||
|
case "tanh":
|
||||||
|
return divideExpr(ONE, powerExpr(fn("cosh", [argument]), int(2)));
|
||||||
|
case "ln":
|
||||||
|
return divideExpr(ONE, argument);
|
||||||
|
case "log10":
|
||||||
|
return divideExpr(ONE, multiplyExpr([argument, fn("ln", [int(10)])]));
|
||||||
|
case "log2":
|
||||||
|
return divideExpr(ONE, multiplyExpr([argument, fn("ln", [int(2)])]));
|
||||||
|
case "sqrt":
|
||||||
|
return divideExpr(ONE, multiplyExpr([int(2), fn("sqrt", [argument])]));
|
||||||
|
case "cbrt":
|
||||||
|
return divideExpr(ONE, multiplyExpr([int(3), powerExpr(fn("cbrt", [argument]), int(2))]));
|
||||||
|
case "exp":
|
||||||
|
return fn("exp", [argument]);
|
||||||
|
case "abs":
|
||||||
|
// d|u|/du = u/|u| — undefined at zero, which the plotter's
|
||||||
|
// discontinuity handling already copes with.
|
||||||
|
return divideExpr(argument, fn("abs", [argument]));
|
||||||
|
case "floor":
|
||||||
|
case "ceil":
|
||||||
|
case "round":
|
||||||
|
// Zero almost everywhere; the jumps are measure-zero and are not
|
||||||
|
// representable here.
|
||||||
|
return ZERO;
|
||||||
|
case "factorial":
|
||||||
|
// The derivative of the gamma function needs the digamma function,
|
||||||
|
// which this build does not carry. Returning zero would be a lie, so
|
||||||
|
// the caller gets an unevaluated marker instead.
|
||||||
|
return fn("factorial", [argument]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Numeric integration
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Definite integral by adaptive Simpson's rule.
|
||||||
|
*
|
||||||
|
* Numeric rather than symbolic: symbolic integration needs a Risch-style
|
||||||
|
* algorithm that is far out of proportion to the feature, and a definite
|
||||||
|
* value is what a calculator user actually asks for. (The symbolic table in
|
||||||
|
* symbolic-integral.ts is tried first where it applies.)
|
||||||
|
*/
|
||||||
|
export function integrateNumeric(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
lower: number,
|
||||||
|
upper: number,
|
||||||
|
tolerance = 1e-9,
|
||||||
|
): number | null {
|
||||||
|
if (!Number.isFinite(lower) || !Number.isFinite(upper)) return null;
|
||||||
|
if (lower === upper) return 0;
|
||||||
|
if (lower > upper) {
|
||||||
|
const flipped = integrateNumeric(expression, variable, upper, lower, tolerance);
|
||||||
|
return flipped === null ? null : -flipped;
|
||||||
|
}
|
||||||
|
|
||||||
|
const f = (x: number): number | null => evaluateValue(expression, { [variable]: x });
|
||||||
|
|
||||||
|
const simpson = (a: number, b: number, fa: number, fb: number, fm: number): number =>
|
||||||
|
((b - a) / 6) * (fa + 4 * fm + fb);
|
||||||
|
|
||||||
|
const adaptive = (
|
||||||
|
a: number,
|
||||||
|
b: number,
|
||||||
|
fa: number,
|
||||||
|
fb: number,
|
||||||
|
fm: number,
|
||||||
|
whole: number,
|
||||||
|
depth: number,
|
||||||
|
): number | null => {
|
||||||
|
const m = (a + b) / 2;
|
||||||
|
const leftMid = (a + m) / 2;
|
||||||
|
const rightMid = (m + b) / 2;
|
||||||
|
const flm = f(leftMid);
|
||||||
|
const frm = f(rightMid);
|
||||||
|
if (flm === null || frm === null) return null;
|
||||||
|
const left = simpson(a, m, fa, fm, flm);
|
||||||
|
const right = simpson(m, b, fm, fb, frm);
|
||||||
|
const total = left + right;
|
||||||
|
// Richardson: the Simpson error term is (total - whole) / 15.
|
||||||
|
if (depth <= 0 || Math.abs(total - whole) <= 15 * tolerance) {
|
||||||
|
return total + (total - whole) / 15;
|
||||||
|
}
|
||||||
|
const leftResult = adaptive(a, m, fa, fm, flm, left, depth - 1);
|
||||||
|
if (leftResult === null) return null;
|
||||||
|
const rightResult = adaptive(m, b, fm, fb, frm, right, depth - 1);
|
||||||
|
if (rightResult === null) return null;
|
||||||
|
return leftResult + rightResult;
|
||||||
|
};
|
||||||
|
|
||||||
|
const fa = f(lower);
|
||||||
|
const fb = f(upper);
|
||||||
|
const fm = f((lower + upper) / 2);
|
||||||
|
if (fa === null || fb === null || fm === null) return null;
|
||||||
|
const whole = simpson(lower, upper, fa, fb, fm);
|
||||||
|
return adaptive(lower, upper, fa, fb, fm, whole, 24);
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
// Finds a digit sequence inside the expansion of a constant.
|
||||||
|
//
|
||||||
|
// The position convention is fixed and stated everywhere it is reported:
|
||||||
|
// **decimal places after the point, 1-based**. So the first `11` in π is at
|
||||||
|
// 94–95, because π = 3.(1)4159… and the 94th digit after the point is the
|
||||||
|
// first `1` of that pair. Every off-by-one complaint about this kind of
|
||||||
|
// feature is a convention that was never written down, so it is written down.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathConstantName,
|
||||||
|
MAXIMUM_COMPUTED_DIGITS,
|
||||||
|
fractionalDigits,
|
||||||
|
} from "./constant-digits";
|
||||||
|
|
||||||
|
export type DigitCountResult = {
|
||||||
|
occurrences: number;
|
||||||
|
searchedDigits: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type DigitMatch = {
|
||||||
|
/** 1-based decimal place of the first digit of the match. */
|
||||||
|
start: number;
|
||||||
|
/** 1-based decimal place of the last digit. */
|
||||||
|
end: number;
|
||||||
|
/** The digits either side, for the reveal. */
|
||||||
|
context: string;
|
||||||
|
/** Where the match sits inside `context`, as an offset. */
|
||||||
|
contextOffset: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** `...3421 ·11· 70679...` with the match marked. */
|
||||||
|
export function highlightedMatch(match: DigitMatch, marker = "·"): string {
|
||||||
|
const length = match.end - match.start + 1;
|
||||||
|
if (match.contextOffset < 0 || match.contextOffset + length > match.context.length) {
|
||||||
|
return match.context;
|
||||||
|
}
|
||||||
|
const before = match.context.slice(0, match.contextOffset);
|
||||||
|
const middle = match.context.slice(match.contextOffset, match.contextOffset + length);
|
||||||
|
const after = match.context.slice(match.contextOffset + length);
|
||||||
|
return `${before}${marker}${middle}${marker}${after}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type DigitSearchOutcome =
|
||||||
|
| { kind: "found"; match: DigitMatch }
|
||||||
|
/**
|
||||||
|
* Searched the whole available expansion and did not find it. Carries how
|
||||||
|
* far the search actually reached, because "not in π" and "not in the first
|
||||||
|
* 20,000 digits of π" are very different claims and only one of them is
|
||||||
|
* true.
|
||||||
|
*/
|
||||||
|
| { kind: "notFound"; searchedDigits: number }
|
||||||
|
| { kind: "invalidPattern"; reason: string };
|
||||||
|
|
||||||
|
/** How many digits either side of a hit to return. */
|
||||||
|
export const DEFAULT_CONTEXT_RADIUS = 6;
|
||||||
|
|
||||||
|
export type DigitSource = (constant: MathConstantName, count: number) => string | null;
|
||||||
|
|
||||||
|
const DEFAULT_SOURCE: DigitSource = (constant, count) => fractionalDigits(constant, count);
|
||||||
|
|
||||||
|
/** Find the `occurrence`-th appearance of `pattern`. */
|
||||||
|
export function findDigits(
|
||||||
|
pattern: string,
|
||||||
|
constant: MathConstantName,
|
||||||
|
occurrence = 1,
|
||||||
|
requested: number = MAXIMUM_COMPUTED_DIGITS,
|
||||||
|
contextRadius: number = DEFAULT_CONTEXT_RADIUS,
|
||||||
|
digitSource: DigitSource = DEFAULT_SOURCE,
|
||||||
|
): DigitSearchOutcome {
|
||||||
|
const cleaned = pattern.replace(/\D/g, "");
|
||||||
|
if (!cleaned) return { kind: "invalidPattern", reason: "Give a sequence of digits to look for" };
|
||||||
|
if (occurrence < 1) return { kind: "invalidPattern", reason: "Occurrence must be 1 or more" };
|
||||||
|
|
||||||
|
const expansion = digitSource(constant, requested);
|
||||||
|
if (!expansion) return { kind: "notFound", searchedDigits: 0 };
|
||||||
|
|
||||||
|
return locateDigits(cleaned, expansion, occurrence, contextRadius);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Search an expansion the caller already has — the path an accepted long run
|
||||||
|
* uses, where the digits come from the deep generator rather than the
|
||||||
|
* shallow cache.
|
||||||
|
*/
|
||||||
|
export function locateDigits(
|
||||||
|
pattern: string,
|
||||||
|
expansion: string,
|
||||||
|
occurrence = 1,
|
||||||
|
contextRadius: number = DEFAULT_CONTEXT_RADIUS,
|
||||||
|
): DigitSearchOutcome {
|
||||||
|
if (pattern.length > expansion.length) {
|
||||||
|
return { kind: "notFound", searchedDigits: expansion.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
let seen = 0;
|
||||||
|
// Plain scan rather than a substring search: overlapping matches count
|
||||||
|
// ("111" contains "11" twice), and indexOf-with-skip would miss the
|
||||||
|
// overlap.
|
||||||
|
for (let index = 0; index <= expansion.length - pattern.length; index++) {
|
||||||
|
let matched = true;
|
||||||
|
for (let offset = 0; offset < pattern.length; offset++) {
|
||||||
|
if (expansion[index + offset] !== pattern[offset]) {
|
||||||
|
matched = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!matched) continue;
|
||||||
|
seen += 1;
|
||||||
|
if (seen !== occurrence) continue;
|
||||||
|
|
||||||
|
const contextStart = Math.max(0, index - contextRadius);
|
||||||
|
const contextEnd = Math.min(expansion.length, index + pattern.length + contextRadius);
|
||||||
|
return {
|
||||||
|
kind: "found",
|
||||||
|
match: {
|
||||||
|
start: index + 1,
|
||||||
|
end: index + pattern.length,
|
||||||
|
context: expansion.slice(contextStart, contextEnd),
|
||||||
|
contextOffset: index - contextStart,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return { kind: "notFound", searchedDigits: expansion.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** How many times the pattern appears in the available expansion. */
|
||||||
|
export function countDigits(
|
||||||
|
pattern: string,
|
||||||
|
constant: MathConstantName,
|
||||||
|
requested: number = MAXIMUM_COMPUTED_DIGITS,
|
||||||
|
digitSource: DigitSource = DEFAULT_SOURCE,
|
||||||
|
): DigitCountResult {
|
||||||
|
const cleaned = pattern.replace(/\D/g, "");
|
||||||
|
if (!cleaned) return { occurrences: 0, searchedDigits: 0 };
|
||||||
|
const expansion = digitSource(constant, requested);
|
||||||
|
if (!expansion) return { occurrences: 0, searchedDigits: 0 };
|
||||||
|
return countInExpansion(cleaned, expansion);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Count overlapping occurrences inside an expansion the caller already has. */
|
||||||
|
export function countInExpansion(pattern: string, expansion: string): DigitCountResult {
|
||||||
|
if (pattern.length > expansion.length) {
|
||||||
|
return { occurrences: 0, searchedDigits: expansion.length };
|
||||||
|
}
|
||||||
|
let total = 0;
|
||||||
|
for (let index = 0; index <= expansion.length - pattern.length; index++) {
|
||||||
|
let matched = true;
|
||||||
|
for (let offset = 0; offset < pattern.length; offset++) {
|
||||||
|
if (expansion[index + offset] !== pattern[offset]) {
|
||||||
|
matched = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (matched) total += 1;
|
||||||
|
}
|
||||||
|
return { occurrences: total, searchedDigits: expansion.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The digits at a given range of decimal places, 1-based inclusive. */
|
||||||
|
export function digitsAt(
|
||||||
|
constant: MathConstantName,
|
||||||
|
start: number,
|
||||||
|
end: number,
|
||||||
|
digitSource: DigitSource = DEFAULT_SOURCE,
|
||||||
|
): string | null {
|
||||||
|
if (start < 1 || end < start) return null;
|
||||||
|
const expansion = digitSource(constant, end);
|
||||||
|
if (!expansion || expansion.length < end) return null;
|
||||||
|
return expansion.slice(start - 1, end);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How deep you would expect to search before a random `length`-digit string
|
||||||
|
* turns up: 10^length places, on average.
|
||||||
|
*
|
||||||
|
* Reported alongside a notFound so the answer is honest about whether the
|
||||||
|
* search was ever likely to succeed — an eight-digit birthday first appears
|
||||||
|
* around the hundred-millionth digit, which no on-device expansion is going
|
||||||
|
* to reach.
|
||||||
|
*/
|
||||||
|
export function expectedFirstPosition(patternLength: number): number | null {
|
||||||
|
if (patternLength <= 0 || patternLength > 18) return null;
|
||||||
|
return Math.pow(10, patternLength);
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
// Numeric evaluation of an expression tree. Two return paths on purpose:
|
||||||
|
// `evaluateExact` keeps rationals as rationals (so a solution can be shown as
|
||||||
|
// `3/2`), while `evaluateValue` collapses to a plain number for the plotter,
|
||||||
|
// which samples thousands of points and has no use for exactness.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
constantValue,
|
||||||
|
evaluateFunction,
|
||||||
|
functionIsDefined,
|
||||||
|
} from "./expression";
|
||||||
|
import {
|
||||||
|
type MathNumber,
|
||||||
|
add,
|
||||||
|
doubleValue,
|
||||||
|
integer,
|
||||||
|
integerValue,
|
||||||
|
isNegative,
|
||||||
|
isZero,
|
||||||
|
multiply,
|
||||||
|
negated,
|
||||||
|
raisedTo,
|
||||||
|
real,
|
||||||
|
} from "./math-number";
|
||||||
|
|
||||||
|
export type EvaluatorContext = {
|
||||||
|
variables: Record<string, MathNumber>;
|
||||||
|
/**
|
||||||
|
* Radians unless the caller says otherwise. Trig in degrees is a real user
|
||||||
|
* expectation for a calculator, and getting it silently wrong produces
|
||||||
|
* answers that look plausible.
|
||||||
|
*/
|
||||||
|
usesDegrees: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function radiansContext(): EvaluatorContext {
|
||||||
|
return { variables: {}, usesDegrees: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
export class EvaluationError extends Error {
|
||||||
|
constructor(message: string) {
|
||||||
|
super(message);
|
||||||
|
this.name = "EvaluationError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Evaluate keeping exactness where possible. Throws on a free variable, so
|
||||||
|
* the caller can distinguish "not a number yet" from "evaluates to NaN".
|
||||||
|
*/
|
||||||
|
export function evaluateExact(expression: MathExpression, context: EvaluatorContext = radiansContext()): MathNumber {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number":
|
||||||
|
return expression.value;
|
||||||
|
|
||||||
|
case "variable": {
|
||||||
|
const value = context.variables[expression.name];
|
||||||
|
if (value === undefined) {
|
||||||
|
throw new EvaluationError(`No value given for ${expression.name}`);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "constant":
|
||||||
|
return real(constantValue(expression.constant));
|
||||||
|
|
||||||
|
case "add":
|
||||||
|
return expression.terms.reduce<MathNumber>(
|
||||||
|
(total, term) => add(total, evaluateExact(term, context)),
|
||||||
|
integer(0),
|
||||||
|
);
|
||||||
|
|
||||||
|
case "multiply":
|
||||||
|
return expression.factors.reduce<MathNumber>(
|
||||||
|
(total, factor) => multiply(total, evaluateExact(factor, context)),
|
||||||
|
integer(1),
|
||||||
|
);
|
||||||
|
|
||||||
|
case "negate":
|
||||||
|
return negated(evaluateExact(expression.inner, context));
|
||||||
|
|
||||||
|
case "power": {
|
||||||
|
const baseValue = evaluateExact(expression.base, context);
|
||||||
|
const exponentValue = evaluateExact(expression.exponent, context);
|
||||||
|
if (isZero(baseValue) && isNegative(exponentValue)) {
|
||||||
|
throw new EvaluationError("Division by zero");
|
||||||
|
}
|
||||||
|
return raisedTo(baseValue, exponentValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "function": {
|
||||||
|
const first = expression.args[0];
|
||||||
|
if (!first) throw new EvaluationError(`${expression.fn} needs an argument`);
|
||||||
|
const argument = evaluateExact(first, context);
|
||||||
|
// Integer factorial stays exact; everything else goes through the
|
||||||
|
// floating-point implementation.
|
||||||
|
const argumentInt = integerValue(argument);
|
||||||
|
if (expression.fn === "factorial" && argumentInt !== null && argumentInt >= 0 && argumentInt <= 20) {
|
||||||
|
let total = 1;
|
||||||
|
for (let value = 2; value <= argumentInt; value++) total *= value;
|
||||||
|
return integer(total);
|
||||||
|
}
|
||||||
|
const raw = adjustForDegrees(expression.fn, doubleValue(argument), context);
|
||||||
|
if (!functionIsDefined(expression.fn, raw)) {
|
||||||
|
throw new EvaluationError(`${expression.fn} is undefined there`);
|
||||||
|
}
|
||||||
|
const result = evaluateFunction(expression.fn, raw);
|
||||||
|
if (!Number.isFinite(result)) {
|
||||||
|
throw new EvaluationError(`${expression.fn} is undefined there`);
|
||||||
|
}
|
||||||
|
return adjustResultForDegrees(expression.fn, result, context);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "relation": {
|
||||||
|
const left = doubleValue(evaluateExact(expression.lhs, context));
|
||||||
|
const right = doubleValue(evaluateExact(expression.rhs, context));
|
||||||
|
let holds: boolean;
|
||||||
|
switch (expression.relation) {
|
||||||
|
case "=":
|
||||||
|
holds = left === right;
|
||||||
|
break;
|
||||||
|
case "<":
|
||||||
|
holds = left < right;
|
||||||
|
break;
|
||||||
|
case "<=":
|
||||||
|
holds = left <= right;
|
||||||
|
break;
|
||||||
|
case ">":
|
||||||
|
holds = left > right;
|
||||||
|
break;
|
||||||
|
case ">=":
|
||||||
|
holds = left >= right;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return integer(holds ? 1 : 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plotting path: never throws, returns null where the function is undefined
|
||||||
|
* so the renderer can break the curve instead of drawing a line across the
|
||||||
|
* gap.
|
||||||
|
*/
|
||||||
|
export function evaluateValue(
|
||||||
|
expression: MathExpression,
|
||||||
|
variables: Record<string, number>,
|
||||||
|
usesDegrees = false,
|
||||||
|
): number | null {
|
||||||
|
const context: EvaluatorContext = { variables: {}, usesDegrees };
|
||||||
|
for (const name of Object.keys(variables)) {
|
||||||
|
context.variables[name] = real(variables[name]!);
|
||||||
|
}
|
||||||
|
let result: MathNumber;
|
||||||
|
try {
|
||||||
|
result = evaluateExact(expression, context);
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const value = doubleValue(result);
|
||||||
|
return Number.isFinite(value) ? value : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Degrees
|
||||||
|
|
||||||
|
function adjustForDegrees(name: string, argument: number, context: EvaluatorContext): number {
|
||||||
|
if (!context.usesDegrees) return argument;
|
||||||
|
switch (name) {
|
||||||
|
case "sin":
|
||||||
|
case "cos":
|
||||||
|
case "tan":
|
||||||
|
return (argument * Math.PI) / 180;
|
||||||
|
default:
|
||||||
|
return argument;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function adjustResultForDegrees(name: string, result: number, context: EvaluatorContext): MathNumber {
|
||||||
|
if (!context.usesDegrees) return real(result);
|
||||||
|
switch (name) {
|
||||||
|
case "asin":
|
||||||
|
case "acos":
|
||||||
|
case "atan":
|
||||||
|
return real((result * 180) / Math.PI);
|
||||||
|
default:
|
||||||
|
return real(result);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,487 @@
|
|||||||
|
// The expression tree everything else operates on: evaluation, simplification,
|
||||||
|
// differentiation, solving, rendering, and plotting. A plain discriminated
|
||||||
|
// union so the whole tree is a value — simplification and differentiation can
|
||||||
|
// rebuild subtrees freely, and structural comparison (expressionEquals) gives
|
||||||
|
// the simplifier the like-term matching it leans on heavily.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathNumber,
|
||||||
|
integer as makeInteger,
|
||||||
|
fromDecimal,
|
||||||
|
isZero as numberIsZero,
|
||||||
|
isOne as numberIsOne,
|
||||||
|
numberEquals as numbersEqual,
|
||||||
|
} from "./math-number";
|
||||||
|
|
||||||
|
export type MathRelation = "=" | "<" | "<=" | ">" | ">=";
|
||||||
|
|
||||||
|
export type MathConstant = "pi" | "e" | "tau";
|
||||||
|
|
||||||
|
export type MathFunction =
|
||||||
|
| "sin"
|
||||||
|
| "cos"
|
||||||
|
| "tan"
|
||||||
|
| "asin"
|
||||||
|
| "acos"
|
||||||
|
| "atan"
|
||||||
|
| "sinh"
|
||||||
|
| "cosh"
|
||||||
|
| "tanh"
|
||||||
|
| "ln"
|
||||||
|
| "log10"
|
||||||
|
| "log2"
|
||||||
|
| "sqrt"
|
||||||
|
| "cbrt"
|
||||||
|
| "abs"
|
||||||
|
| "exp"
|
||||||
|
| "floor"
|
||||||
|
| "ceil"
|
||||||
|
| "round"
|
||||||
|
| "factorial";
|
||||||
|
|
||||||
|
export const ALL_FUNCTIONS: readonly MathFunction[] = [
|
||||||
|
"sin",
|
||||||
|
"cos",
|
||||||
|
"tan",
|
||||||
|
"asin",
|
||||||
|
"acos",
|
||||||
|
"atan",
|
||||||
|
"sinh",
|
||||||
|
"cosh",
|
||||||
|
"tanh",
|
||||||
|
"ln",
|
||||||
|
"log10",
|
||||||
|
"log2",
|
||||||
|
"sqrt",
|
||||||
|
"cbrt",
|
||||||
|
"abs",
|
||||||
|
"exp",
|
||||||
|
"floor",
|
||||||
|
"ceil",
|
||||||
|
"round",
|
||||||
|
"factorial",
|
||||||
|
];
|
||||||
|
|
||||||
|
export const ALL_CONSTANTS: readonly MathConstant[] = ["pi", "e", "tau"];
|
||||||
|
|
||||||
|
export type MathExpression =
|
||||||
|
| { type: "number"; value: MathNumber }
|
||||||
|
/** A free variable — `x`, `y`, `theta`. */
|
||||||
|
| { type: "variable"; name: string }
|
||||||
|
/**
|
||||||
|
* A named constant with a known value (`pi`, `e`). Kept distinct from
|
||||||
|
* `variable` so "solve for pi" is impossible and `2π` stays exact instead of
|
||||||
|
* becoming 6.283…
|
||||||
|
*/
|
||||||
|
| { type: "constant"; constant: MathConstant }
|
||||||
|
| { type: "add"; terms: MathExpression[] }
|
||||||
|
| { type: "multiply"; factors: MathExpression[] }
|
||||||
|
| { type: "power"; base: MathExpression; exponent: MathExpression }
|
||||||
|
/**
|
||||||
|
* Unary negation. Not folded into `multiply([-1, x])` because the renderers
|
||||||
|
* and the step explanations both want to say "negative x".
|
||||||
|
*/
|
||||||
|
| { type: "negate"; inner: MathExpression }
|
||||||
|
| { type: "function"; fn: MathFunction; args: MathExpression[] }
|
||||||
|
/** An equation or inequality — the root node of anything solvable. */
|
||||||
|
| { type: "relation"; relation: MathRelation; lhs: MathExpression; rhs: MathExpression };
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Convenience constructors
|
||||||
|
|
||||||
|
export function num(value: MathNumber): MathExpression {
|
||||||
|
return { type: "number", value };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function int(value: number): MathExpression {
|
||||||
|
return num(makeInteger(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function realExpr(value: number): MathExpression {
|
||||||
|
return num(fromDecimal(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function variable(name: string): MathExpression {
|
||||||
|
return { type: "variable", name };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function constant(value: MathConstant): MathExpression {
|
||||||
|
return { type: "constant", constant: value };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function addExpr(terms: MathExpression[]): MathExpression {
|
||||||
|
return { type: "add", terms };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function multiplyExpr(factors: MathExpression[]): MathExpression {
|
||||||
|
return { type: "multiply", factors };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function powerExpr(base: MathExpression, exponent: MathExpression): MathExpression {
|
||||||
|
return { type: "power", base, exponent };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function negate(inner: MathExpression): MathExpression {
|
||||||
|
return { type: "negate", inner };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function fn(name: MathFunction, args: MathExpression[]): MathExpression {
|
||||||
|
return { type: "function", fn: name, args };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function relation(rel: MathRelation, lhs: MathExpression, rhs: MathExpression): MathExpression {
|
||||||
|
return { type: "relation", relation: rel, lhs, rhs };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function subtractExpr(lhs: MathExpression, rhs: MathExpression): MathExpression {
|
||||||
|
return addExpr([lhs, negate(rhs)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Division is `a * b^-1` in the tree, which is what makes the simplifier and
|
||||||
|
* the differentiator tractable — the renderers detect the pattern and print a
|
||||||
|
* real fraction, so nothing user-visible degrades.
|
||||||
|
*/
|
||||||
|
export function divideExpr(lhs: MathExpression, rhs: MathExpression): MathExpression {
|
||||||
|
return multiplyExpr([lhs, powerExpr(rhs, int(-1))]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ZERO: MathExpression = int(0);
|
||||||
|
export const ONE: MathExpression = int(1);
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Introspection
|
||||||
|
|
||||||
|
export function isZeroExpr(expression: MathExpression): boolean {
|
||||||
|
return expression.type === "number" && numberIsZero(expression.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isOneExpr(expression: MathExpression): boolean {
|
||||||
|
return expression.type === "number" && numberIsOne(expression.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function numberValue(expression: MathExpression): MathNumber | null {
|
||||||
|
return expression.type === "number" ? expression.value : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every free variable in the tree, in first-appearance order. Order matters:
|
||||||
|
* it decides which variable "solve for x" defaults to and which axis a
|
||||||
|
* single-variable graph uses.
|
||||||
|
*/
|
||||||
|
export function variablesOf(expression: MathExpression): string[] {
|
||||||
|
const seen = new Set<string>();
|
||||||
|
const ordered: string[] = [];
|
||||||
|
collectVariables(expression, ordered, seen);
|
||||||
|
return ordered;
|
||||||
|
}
|
||||||
|
|
||||||
|
function collectVariables(expression: MathExpression, ordered: string[], seen: Set<string>): void {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "variable":
|
||||||
|
if (!seen.has(expression.name)) {
|
||||||
|
seen.add(expression.name);
|
||||||
|
ordered.push(expression.name);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "number":
|
||||||
|
case "constant":
|
||||||
|
break;
|
||||||
|
case "add":
|
||||||
|
for (const term of expression.terms) collectVariables(term, ordered, seen);
|
||||||
|
break;
|
||||||
|
case "multiply":
|
||||||
|
for (const factor of expression.factors) collectVariables(factor, ordered, seen);
|
||||||
|
break;
|
||||||
|
case "power":
|
||||||
|
collectVariables(expression.base, ordered, seen);
|
||||||
|
collectVariables(expression.exponent, ordered, seen);
|
||||||
|
break;
|
||||||
|
case "negate":
|
||||||
|
collectVariables(expression.inner, ordered, seen);
|
||||||
|
break;
|
||||||
|
case "function":
|
||||||
|
for (const argument of expression.args) collectVariables(argument, ordered, seen);
|
||||||
|
break;
|
||||||
|
case "relation":
|
||||||
|
collectVariables(expression.lhs, ordered, seen);
|
||||||
|
collectVariables(expression.rhs, ordered, seen);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isRelation(expression: MathExpression): boolean {
|
||||||
|
return expression.type === "relation";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Node count — used to pick the simpler of two equivalent forms and to bound
|
||||||
|
* runaway expansion in the simplifier.
|
||||||
|
*/
|
||||||
|
export function complexity(expression: MathExpression): number {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number":
|
||||||
|
case "variable":
|
||||||
|
case "constant":
|
||||||
|
return 1;
|
||||||
|
case "add":
|
||||||
|
return 1 + expression.terms.reduce((total, term) => total + complexity(term), 0);
|
||||||
|
case "multiply":
|
||||||
|
return 1 + expression.factors.reduce((total, factor) => total + complexity(factor), 0);
|
||||||
|
case "power":
|
||||||
|
return 1 + complexity(expression.base) + complexity(expression.exponent);
|
||||||
|
case "negate":
|
||||||
|
return 1 + complexity(expression.inner);
|
||||||
|
case "function":
|
||||||
|
return 1 + expression.args.reduce((total, argument) => total + complexity(argument), 0);
|
||||||
|
case "relation":
|
||||||
|
return 1 + complexity(expression.lhs) + complexity(expression.rhs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Replace every occurrence of a variable with an expression. */
|
||||||
|
export function substituting(
|
||||||
|
expression: MathExpression,
|
||||||
|
name: string,
|
||||||
|
replacement: MathExpression,
|
||||||
|
): MathExpression {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "variable":
|
||||||
|
return expression.name === name ? replacement : expression;
|
||||||
|
case "number":
|
||||||
|
case "constant":
|
||||||
|
return expression;
|
||||||
|
case "add":
|
||||||
|
return addExpr(expression.terms.map((term) => substituting(term, name, replacement)));
|
||||||
|
case "multiply":
|
||||||
|
return multiplyExpr(expression.factors.map((factor) => substituting(factor, name, replacement)));
|
||||||
|
case "power":
|
||||||
|
return powerExpr(
|
||||||
|
substituting(expression.base, name, replacement),
|
||||||
|
substituting(expression.exponent, name, replacement),
|
||||||
|
);
|
||||||
|
case "negate":
|
||||||
|
return negate(substituting(expression.inner, name, replacement));
|
||||||
|
case "function":
|
||||||
|
return fn(
|
||||||
|
expression.fn,
|
||||||
|
expression.args.map((argument) => substituting(argument, name, replacement)),
|
||||||
|
);
|
||||||
|
case "relation":
|
||||||
|
return relation(
|
||||||
|
expression.relation,
|
||||||
|
substituting(expression.lhs, name, replacement),
|
||||||
|
substituting(expression.rhs, name, replacement),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Structural equality with value-equal numbers (MathNumber compares by
|
||||||
|
* value).
|
||||||
|
*/
|
||||||
|
export function expressionEquals(a: MathExpression, b: MathExpression): boolean {
|
||||||
|
if (a === b) return true;
|
||||||
|
if (a.type !== b.type) return false;
|
||||||
|
switch (a.type) {
|
||||||
|
case "number": {
|
||||||
|
const other = b as Extract<MathExpression, { type: "number" }>;
|
||||||
|
return numbersEqual(a.value, other.value);
|
||||||
|
}
|
||||||
|
case "variable":
|
||||||
|
return a.name === (b as Extract<MathExpression, { type: "variable" }>).name;
|
||||||
|
case "constant":
|
||||||
|
return a.constant === (b as Extract<MathExpression, { type: "constant" }>).constant;
|
||||||
|
case "add": {
|
||||||
|
const other = b as Extract<MathExpression, { type: "add" }>;
|
||||||
|
return listEquals(a.terms, other.terms);
|
||||||
|
}
|
||||||
|
case "multiply": {
|
||||||
|
const other = b as Extract<MathExpression, { type: "multiply" }>;
|
||||||
|
return listEquals(a.factors, other.factors);
|
||||||
|
}
|
||||||
|
case "power": {
|
||||||
|
const other = b as Extract<MathExpression, { type: "power" }>;
|
||||||
|
return expressionEquals(a.base, other.base) && expressionEquals(a.exponent, other.exponent);
|
||||||
|
}
|
||||||
|
case "negate":
|
||||||
|
return expressionEquals(a.inner, (b as Extract<MathExpression, { type: "negate" }>).inner);
|
||||||
|
case "function": {
|
||||||
|
const other = b as Extract<MathExpression, { type: "function" }>;
|
||||||
|
return a.fn === other.fn && listEquals(a.args, other.args);
|
||||||
|
}
|
||||||
|
case "relation": {
|
||||||
|
const other = b as Extract<MathExpression, { type: "relation" }>;
|
||||||
|
return (
|
||||||
|
a.relation === other.relation &&
|
||||||
|
expressionEquals(a.lhs, other.lhs) &&
|
||||||
|
expressionEquals(a.rhs, other.rhs)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function listEquals(a: MathExpression[], b: MathExpression[]): boolean {
|
||||||
|
if (a.length !== b.length) return false;
|
||||||
|
for (let index = 0; index < a.length; index++) {
|
||||||
|
if (!expressionEquals(a[index]!, b[index]!)) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Relations
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The relation you get by multiplying or dividing both sides by a negative —
|
||||||
|
* the classic inequality mistake, handled explicitly.
|
||||||
|
*/
|
||||||
|
export function flippedRelation(rel: MathRelation): MathRelation {
|
||||||
|
switch (rel) {
|
||||||
|
case "=":
|
||||||
|
return "=";
|
||||||
|
case "<":
|
||||||
|
return ">";
|
||||||
|
case "<=":
|
||||||
|
return ">=";
|
||||||
|
case ">":
|
||||||
|
return "<";
|
||||||
|
case ">=":
|
||||||
|
return "<=";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function spokenRelation(rel: MathRelation): string {
|
||||||
|
switch (rel) {
|
||||||
|
case "=":
|
||||||
|
return "equals";
|
||||||
|
case "<":
|
||||||
|
return "is less than";
|
||||||
|
case "<=":
|
||||||
|
return "is at most";
|
||||||
|
case ">":
|
||||||
|
return "is greater than";
|
||||||
|
case ">=":
|
||||||
|
return "is at least";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Constants
|
||||||
|
|
||||||
|
export function constantValue(value: MathConstant): number {
|
||||||
|
switch (value) {
|
||||||
|
case "pi":
|
||||||
|
return Math.PI;
|
||||||
|
case "e":
|
||||||
|
return Math.E;
|
||||||
|
case "tau":
|
||||||
|
return 2 * Math.PI;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Functions
|
||||||
|
|
||||||
|
export function evaluateFunction(name: MathFunction, argument: number): number {
|
||||||
|
switch (name) {
|
||||||
|
case "sin":
|
||||||
|
return Math.sin(argument);
|
||||||
|
case "cos":
|
||||||
|
return Math.cos(argument);
|
||||||
|
case "tan":
|
||||||
|
return Math.tan(argument);
|
||||||
|
case "asin":
|
||||||
|
return Math.asin(argument);
|
||||||
|
case "acos":
|
||||||
|
return Math.acos(argument);
|
||||||
|
case "atan":
|
||||||
|
return Math.atan(argument);
|
||||||
|
case "sinh":
|
||||||
|
return Math.sinh(argument);
|
||||||
|
case "cosh":
|
||||||
|
return Math.cosh(argument);
|
||||||
|
case "tanh":
|
||||||
|
return Math.tanh(argument);
|
||||||
|
case "ln":
|
||||||
|
return Math.log(argument);
|
||||||
|
case "log10":
|
||||||
|
return Math.log10(argument);
|
||||||
|
case "log2":
|
||||||
|
return Math.log2(argument);
|
||||||
|
case "sqrt":
|
||||||
|
return Math.sqrt(argument);
|
||||||
|
case "cbrt":
|
||||||
|
return Math.cbrt(argument);
|
||||||
|
case "abs":
|
||||||
|
return Math.abs(argument);
|
||||||
|
case "exp":
|
||||||
|
return Math.exp(argument);
|
||||||
|
case "floor":
|
||||||
|
return Math.floor(argument);
|
||||||
|
case "ceil":
|
||||||
|
return Math.ceil(argument);
|
||||||
|
case "round":
|
||||||
|
return Math.round(argument);
|
||||||
|
case "factorial":
|
||||||
|
// Real factorial via the gamma function, so `2.5!` is defined rather
|
||||||
|
// than an error — and so the evaluator has one code path for both.
|
||||||
|
return gamma(argument + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Domain check used by the plotter to break a curve rather than draw a line
|
||||||
|
* through a gap (`ln` left of zero, `tan` at its asymptotes).
|
||||||
|
*/
|
||||||
|
export function functionIsDefined(name: MathFunction, argument: number): boolean {
|
||||||
|
switch (name) {
|
||||||
|
case "ln":
|
||||||
|
case "log10":
|
||||||
|
case "log2":
|
||||||
|
return argument > 0;
|
||||||
|
case "sqrt":
|
||||||
|
return argument >= 0;
|
||||||
|
case "asin":
|
||||||
|
case "acos":
|
||||||
|
return argument >= -1 && argument <= 1;
|
||||||
|
case "factorial":
|
||||||
|
return argument > -1 || Math.round(argument) !== argument;
|
||||||
|
default:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lanczos approximation of the gamma function (JavaScript has no tgamma).
|
||||||
|
* Accurate to well past the display precision used anywhere in this app.
|
||||||
|
*/
|
||||||
|
export function gamma(x: number): number {
|
||||||
|
if (Number.isNaN(x)) return NaN;
|
||||||
|
if (x === Math.round(x)) {
|
||||||
|
if (x <= 0) return NaN; // poles at non-positive integers
|
||||||
|
if (x <= 171) {
|
||||||
|
let result = 1;
|
||||||
|
for (let k = 2; k < x; k++) result *= k;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
return Infinity;
|
||||||
|
}
|
||||||
|
if (x < 0.5) {
|
||||||
|
// Reflection formula.
|
||||||
|
return Math.PI / (Math.sin(Math.PI * x) * gamma(1 - x));
|
||||||
|
}
|
||||||
|
const g = 7;
|
||||||
|
const coefficients = [
|
||||||
|
0.99999999999980993, 676.5203681218851, -1259.1392167224028, 771.32342877765313,
|
||||||
|
-176.61502916214059, 12.507343278686905, -0.13857109526572012, 9.9843695780195716e-6,
|
||||||
|
1.5056327351493116e-7,
|
||||||
|
];
|
||||||
|
const z = x - 1;
|
||||||
|
let sum = coefficients[0]!;
|
||||||
|
for (let index = 1; index < g + 2; index++) {
|
||||||
|
sum += coefficients[index]! / (z + index);
|
||||||
|
}
|
||||||
|
const t = z + g + 0.5;
|
||||||
|
return Math.sqrt(2 * Math.PI) * Math.pow(t, z + 0.5) * Math.exp(-t) * sum;
|
||||||
|
}
|
||||||
@@ -0,0 +1,274 @@
|
|||||||
|
// The parts of geometry the calculator's spoken-question surface reaches:
|
||||||
|
// shapes, triangle-from-sides, and Pythagoras.
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Triangles
|
||||||
|
|
||||||
|
/** A triangle solved from whatever three parts were given. */
|
||||||
|
export type Triangle = {
|
||||||
|
/** Side lengths, opposite the same-named angles. */
|
||||||
|
a: number;
|
||||||
|
b: number;
|
||||||
|
c: number;
|
||||||
|
/** Angles in radians. */
|
||||||
|
angleA: number;
|
||||||
|
angleB: number;
|
||||||
|
angleC: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function triangleArea(triangle: Triangle): number {
|
||||||
|
// Heron's formula, in the numerically stable ordering: the naive form
|
||||||
|
// loses most of its precision on a needle-thin triangle.
|
||||||
|
const sides = [triangle.a, triangle.b, triangle.c].sort((p, q) => q - p);
|
||||||
|
const [x, y, z] = [sides[0]!, sides[1]!, sides[2]!];
|
||||||
|
const term = (x + (y + z)) * (z - (x - y)) * (z + (x - y)) * (x + (y - z));
|
||||||
|
return term <= 0 ? 0 : Math.sqrt(term) / 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function trianglePerimeter(triangle: Triangle): number {
|
||||||
|
return triangle.a + triangle.b + triangle.c;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function triangleKind(triangle: Triangle): string {
|
||||||
|
const tolerance = 1e-9;
|
||||||
|
const sides = [triangle.a, triangle.b, triangle.c].sort((p, q) => p - q);
|
||||||
|
const descriptors: string[] = [];
|
||||||
|
if (Math.abs(sides[0]! - sides[2]!) < tolerance) {
|
||||||
|
descriptors.push("equilateral");
|
||||||
|
} else if (Math.abs(sides[0]! - sides[1]!) < tolerance || Math.abs(sides[1]! - sides[2]!) < tolerance) {
|
||||||
|
descriptors.push("isosceles");
|
||||||
|
} else {
|
||||||
|
descriptors.push("scalene");
|
||||||
|
}
|
||||||
|
const largest = Math.max(triangle.angleA, triangle.angleB, triangle.angleC);
|
||||||
|
if (Math.abs(largest - Math.PI / 2) < 1e-6) {
|
||||||
|
descriptors.push("right");
|
||||||
|
} else if (largest > Math.PI / 2) {
|
||||||
|
descriptors.push("obtuse");
|
||||||
|
} else {
|
||||||
|
descriptors.push("acute");
|
||||||
|
}
|
||||||
|
return descriptors.join(", ");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function triangleAnglesInDegrees(triangle: Triangle): [number, number, number] {
|
||||||
|
return [
|
||||||
|
(triangle.angleA * 180) / Math.PI,
|
||||||
|
(triangle.angleB * 180) / Math.PI,
|
||||||
|
(triangle.angleC * 180) / Math.PI,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
export type TriangleResult =
|
||||||
|
| { kind: "one"; triangle: Triangle }
|
||||||
|
/**
|
||||||
|
* SSA can genuinely produce two valid triangles. Returning one and calling
|
||||||
|
* it solved is the classic wrong answer in this topic.
|
||||||
|
*/
|
||||||
|
| { kind: "two"; first: Triangle; second: Triangle }
|
||||||
|
| { kind: "impossible"; reason: string };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Guards acos/asin against a value a hair outside [-1, 1] from rounding,
|
||||||
|
* which returns NaN and poisons everything downstream.
|
||||||
|
*/
|
||||||
|
function clampedToUnit(value: number): number {
|
||||||
|
return Math.min(1, Math.max(-1, value));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Three sides. */
|
||||||
|
export function triangleFromSides(a: number, b: number, c: number): TriangleResult {
|
||||||
|
if (a <= 0 || b <= 0 || c <= 0) return { kind: "impossible", reason: "Sides must be positive" };
|
||||||
|
if (a + b <= c || b + c <= a || a + c <= b) {
|
||||||
|
return { kind: "impossible", reason: "Those sides cannot close a triangle" };
|
||||||
|
}
|
||||||
|
const angleA = Math.acos(clampedToUnit((b * b + c * c - a * a) / (2 * b * c)));
|
||||||
|
const angleB = Math.acos(clampedToUnit((a * a + c * c - b * b) / (2 * a * c)));
|
||||||
|
return {
|
||||||
|
kind: "one",
|
||||||
|
triangle: { a, b, c, angleA, angleB, angleC: Math.PI - angleA - angleB },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Shapes
|
||||||
|
|
||||||
|
export type Shape =
|
||||||
|
| { kind: "circle"; radius: number }
|
||||||
|
| { kind: "rectangle"; width: number; height: number }
|
||||||
|
| { kind: "square"; side: number }
|
||||||
|
| { kind: "triangleBaseHeight"; base: number; height: number }
|
||||||
|
| { kind: "trapezoid"; a: number; b: number; height: number }
|
||||||
|
| { kind: "parallelogram"; base: number; height: number }
|
||||||
|
| { kind: "regularPolygon"; sides: number; sideLength: number }
|
||||||
|
| { kind: "ellipse"; a: number; b: number }
|
||||||
|
// Solids
|
||||||
|
| { kind: "sphere"; radius: number }
|
||||||
|
| { kind: "cylinder"; radius: number; height: number }
|
||||||
|
| { kind: "cone"; radius: number; height: number }
|
||||||
|
| { kind: "cube"; side: number }
|
||||||
|
| { kind: "rectangularPrism"; length: number; width: number; height: number }
|
||||||
|
| { kind: "pyramid"; baseArea: number; height: number };
|
||||||
|
|
||||||
|
export function shapeName(shape: Shape): string {
|
||||||
|
switch (shape.kind) {
|
||||||
|
case "circle":
|
||||||
|
return "circle";
|
||||||
|
case "rectangle":
|
||||||
|
return "rectangle";
|
||||||
|
case "square":
|
||||||
|
return "square";
|
||||||
|
case "triangleBaseHeight":
|
||||||
|
return "triangle";
|
||||||
|
case "trapezoid":
|
||||||
|
return "trapezoid";
|
||||||
|
case "parallelogram":
|
||||||
|
return "parallelogram";
|
||||||
|
case "regularPolygon":
|
||||||
|
return `regular ${shape.sides}-gon`;
|
||||||
|
case "ellipse":
|
||||||
|
return "ellipse";
|
||||||
|
case "sphere":
|
||||||
|
return "sphere";
|
||||||
|
case "cylinder":
|
||||||
|
return "cylinder";
|
||||||
|
case "cone":
|
||||||
|
return "cone";
|
||||||
|
case "cube":
|
||||||
|
return "cube";
|
||||||
|
case "rectangularPrism":
|
||||||
|
return "rectangular prism";
|
||||||
|
case "pyramid":
|
||||||
|
return "pyramid";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function shapeIsSolid(shape: Shape): boolean {
|
||||||
|
switch (shape.kind) {
|
||||||
|
case "sphere":
|
||||||
|
case "cylinder":
|
||||||
|
case "cone":
|
||||||
|
case "cube":
|
||||||
|
case "rectangularPrism":
|
||||||
|
case "pyramid":
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Area for a plane figure; surface area for a solid. */
|
||||||
|
export function shapeArea(shape: Shape): number | null {
|
||||||
|
switch (shape.kind) {
|
||||||
|
case "circle":
|
||||||
|
return Math.PI * shape.radius * shape.radius;
|
||||||
|
case "rectangle":
|
||||||
|
return shape.width * shape.height;
|
||||||
|
case "square":
|
||||||
|
return shape.side * shape.side;
|
||||||
|
case "triangleBaseHeight":
|
||||||
|
return (shape.base * shape.height) / 2;
|
||||||
|
case "trapezoid":
|
||||||
|
return ((shape.a + shape.b) * shape.height) / 2;
|
||||||
|
case "parallelogram":
|
||||||
|
return shape.base * shape.height;
|
||||||
|
case "regularPolygon":
|
||||||
|
return shape.sides >= 3
|
||||||
|
? (shape.sides * shape.sideLength * shape.sideLength) / (4 * Math.tan(Math.PI / shape.sides))
|
||||||
|
: null;
|
||||||
|
case "ellipse":
|
||||||
|
return Math.PI * shape.a * shape.b;
|
||||||
|
case "sphere":
|
||||||
|
return 4 * Math.PI * shape.radius * shape.radius;
|
||||||
|
case "cylinder":
|
||||||
|
return 2 * Math.PI * shape.radius * (shape.radius + shape.height);
|
||||||
|
case "cone":
|
||||||
|
return (
|
||||||
|
Math.PI *
|
||||||
|
shape.radius *
|
||||||
|
(shape.radius + Math.sqrt(shape.radius * shape.radius + shape.height * shape.height))
|
||||||
|
);
|
||||||
|
case "cube":
|
||||||
|
return 6 * shape.side * shape.side;
|
||||||
|
case "rectangularPrism":
|
||||||
|
return (
|
||||||
|
2 *
|
||||||
|
(shape.length * shape.width + shape.length * shape.height + shape.width * shape.height)
|
||||||
|
);
|
||||||
|
case "pyramid":
|
||||||
|
return null; // needs the base shape, not just its area
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function shapePerimeter(shape: Shape): number | null {
|
||||||
|
switch (shape.kind) {
|
||||||
|
case "circle":
|
||||||
|
return 2 * Math.PI * shape.radius;
|
||||||
|
case "rectangle":
|
||||||
|
return 2 * (shape.width + shape.height);
|
||||||
|
case "square":
|
||||||
|
return 4 * shape.side;
|
||||||
|
case "regularPolygon":
|
||||||
|
return shape.sides >= 3 ? shape.sides * shape.sideLength : null;
|
||||||
|
case "ellipse": {
|
||||||
|
// Ramanujan's second approximation — accurate to ~1e-9 for any
|
||||||
|
// realistic eccentricity, where the naive π(a+b) is not close.
|
||||||
|
const h = ((shape.a - shape.b) * (shape.a - shape.b)) / ((shape.a + shape.b) * (shape.a + shape.b));
|
||||||
|
return Math.PI * (shape.a + shape.b) * (1 + (3 * h) / (10 + Math.sqrt(4 - 3 * h)));
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
// Trapezoid/triangle/parallelogram need every side, and the constructor
|
||||||
|
// only took the measurements the area formula uses. Solids have none.
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function shapeVolume(shape: Shape): number | null {
|
||||||
|
switch (shape.kind) {
|
||||||
|
case "sphere":
|
||||||
|
return (4 / 3) * Math.PI * shape.radius * shape.radius * shape.radius;
|
||||||
|
case "cylinder":
|
||||||
|
return Math.PI * shape.radius * shape.radius * shape.height;
|
||||||
|
case "cone":
|
||||||
|
return (Math.PI * shape.radius * shape.radius * shape.height) / 3;
|
||||||
|
case "cube":
|
||||||
|
return shape.side * shape.side * shape.side;
|
||||||
|
case "rectangularPrism":
|
||||||
|
return shape.length * shape.width * shape.height;
|
||||||
|
case "pyramid":
|
||||||
|
return (shape.baseArea * shape.height) / 3;
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Everything known, for the readback. */
|
||||||
|
export function shapeSummary(shape: Shape): [string, number][] {
|
||||||
|
const parts: [string, number][] = [];
|
||||||
|
const area = shapeArea(shape);
|
||||||
|
if (area !== null) parts.push([shapeIsSolid(shape) ? "Surface area" : "Area", area]);
|
||||||
|
const perimeter = shapePerimeter(shape);
|
||||||
|
if (perimeter !== null) parts.push(["Perimeter", perimeter]);
|
||||||
|
const volume = shapeVolume(shape);
|
||||||
|
if (volume !== null) parts.push(["Volume", volume]);
|
||||||
|
return parts;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Coordinate geometry
|
||||||
|
|
||||||
|
/** Pythagoras, either direction: give any two, get the third. */
|
||||||
|
export function pythagoras(
|
||||||
|
a: number | null,
|
||||||
|
b: number | null,
|
||||||
|
hypotenuse: number | null,
|
||||||
|
): number | null {
|
||||||
|
if (a !== null && b !== null && hypotenuse === null) return Math.sqrt(a * a + b * b);
|
||||||
|
if (a !== null && b === null && hypotenuse !== null) {
|
||||||
|
return hypotenuse > a ? Math.sqrt(hypotenuse * hypotenuse - a * a) : null;
|
||||||
|
}
|
||||||
|
if (a === null && b !== null && hypotenuse !== null) {
|
||||||
|
return hypotenuse > b ? Math.sqrt(hypotenuse * hypotenuse - b * b) : null;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,219 @@
|
|||||||
|
// Tokeniser for typed and normalised spoken maths expressions.
|
||||||
|
|
||||||
|
import { type MathNumber, fromDecimal, integer, real } from "./math-number";
|
||||||
|
import { type MathRelation } from "./expression";
|
||||||
|
import { isLetter } from "../../../util/unicode-class";
|
||||||
|
|
||||||
|
export type MathToken =
|
||||||
|
| { type: "number"; value: MathNumber }
|
||||||
|
| { type: "identifier"; name: string }
|
||||||
|
| { type: "plus" }
|
||||||
|
| { type: "minus" }
|
||||||
|
| { type: "star" }
|
||||||
|
| { type: "slash" }
|
||||||
|
| { type: "percent" }
|
||||||
|
| { type: "caret" }
|
||||||
|
| { type: "bang" }
|
||||||
|
| { type: "leftParen" }
|
||||||
|
| { type: "rightParen" }
|
||||||
|
| { type: "pipe" }
|
||||||
|
| { type: "comma" }
|
||||||
|
| { type: "relation"; relation: MathRelation };
|
||||||
|
|
||||||
|
export type MathParseErrorKind =
|
||||||
|
| { kind: "unexpectedCharacter"; character: string }
|
||||||
|
| { kind: "unexpectedToken"; token: string }
|
||||||
|
| { kind: "unexpectedEnd" }
|
||||||
|
| { kind: "unbalancedParenthesis" }
|
||||||
|
| { kind: "unknownFunction"; name: string }
|
||||||
|
| { kind: "emptyInput" }
|
||||||
|
| { kind: "tooComplex" };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A parse failure with the user's own words attached, so an error can quote
|
||||||
|
* back what was actually said rather than leaving the wearer guessing which
|
||||||
|
* word broke.
|
||||||
|
*/
|
||||||
|
export class MathParseError extends Error {
|
||||||
|
readonly errorKind: MathParseErrorKind;
|
||||||
|
/** What the user actually said. */
|
||||||
|
readonly context: string;
|
||||||
|
|
||||||
|
constructor(errorKind: MathParseErrorKind, context = "") {
|
||||||
|
super(describeParseError(errorKind, context));
|
||||||
|
this.name = "MathParseError";
|
||||||
|
this.errorKind = errorKind;
|
||||||
|
this.context = context;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Written for someone reading a lens mid-task, not for a log. */
|
||||||
|
export function describeParseError(kind: MathParseErrorKind, context: string): string {
|
||||||
|
const quoted = context ? `“${context}”` : "that expression";
|
||||||
|
switch (kind.kind) {
|
||||||
|
case "unexpectedCharacter":
|
||||||
|
return `Could not read "${kind.character}" in ${quoted}`;
|
||||||
|
case "unexpectedToken":
|
||||||
|
return `Did not expect "${kind.token}" in ${quoted}`;
|
||||||
|
case "unexpectedEnd":
|
||||||
|
return `${quoted} is incomplete`;
|
||||||
|
case "unbalancedParenthesis":
|
||||||
|
return `Brackets do not balance in ${quoted}`;
|
||||||
|
case "unknownFunction":
|
||||||
|
return `"${kind.name}" is not a function this build knows`;
|
||||||
|
case "emptyInput":
|
||||||
|
return "Nothing to solve";
|
||||||
|
case "tooComplex":
|
||||||
|
return "That expression is too deeply nested";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isDigit(character: string): boolean {
|
||||||
|
return character >= "0" && character <= "9";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function tokenize(input: string): MathToken[] {
|
||||||
|
const tokens: MathToken[] = [];
|
||||||
|
const characters = Array.from(input);
|
||||||
|
let index = 0;
|
||||||
|
|
||||||
|
while (index < characters.length) {
|
||||||
|
const character = characters[index]!;
|
||||||
|
|
||||||
|
if (/\s/.test(character)) {
|
||||||
|
index += 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isDigit(character) || (character === "." && index + 1 < characters.length && isDigit(characters[index + 1]!))) {
|
||||||
|
let literal = "";
|
||||||
|
let sawDot = false;
|
||||||
|
while (index < characters.length) {
|
||||||
|
const next = characters[index]!;
|
||||||
|
if (isDigit(next)) {
|
||||||
|
literal += next;
|
||||||
|
} else if (next === "." && !sawDot) {
|
||||||
|
sawDot = true;
|
||||||
|
literal += next;
|
||||||
|
} else if (next === "," && index + 1 < characters.length && isDigit(characters[index + 1]!)) {
|
||||||
|
// Thousands separator inside a literal: 1,000
|
||||||
|
index += 1;
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
index += 1;
|
||||||
|
}
|
||||||
|
// Decimals become exact rationals so later arithmetic stays exact:
|
||||||
|
// 0.25 behaves as 1/4, not as a float.
|
||||||
|
if (sawDot) {
|
||||||
|
tokens.push({ type: "number", value: fromDecimal(Number(literal) || 0) });
|
||||||
|
} else {
|
||||||
|
const parsed = Number(literal);
|
||||||
|
// Exact for every safe literal; anything larger degrades to a real
|
||||||
|
// instead of losing digits silently.
|
||||||
|
tokens.push({
|
||||||
|
type: "number",
|
||||||
|
value: Number.isSafeInteger(parsed) ? integer(parsed) : real(parsed),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isLetter(character) || character === "_") {
|
||||||
|
let name = "";
|
||||||
|
while (
|
||||||
|
index < characters.length &&
|
||||||
|
(isLetter(characters[index]!) || isDigit(characters[index]!) || characters[index] === "_")
|
||||||
|
) {
|
||||||
|
name += characters[index];
|
||||||
|
index += 1;
|
||||||
|
}
|
||||||
|
tokens.push({ type: "identifier", name });
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (character) {
|
||||||
|
case "+":
|
||||||
|
tokens.push({ type: "plus" });
|
||||||
|
break;
|
||||||
|
case "-":
|
||||||
|
case "−": // ASCII and Unicode minus
|
||||||
|
tokens.push({ type: "minus" });
|
||||||
|
break;
|
||||||
|
case "*":
|
||||||
|
case "×":
|
||||||
|
case "⋅":
|
||||||
|
tokens.push({ type: "star" });
|
||||||
|
break;
|
||||||
|
case "/":
|
||||||
|
case "÷":
|
||||||
|
tokens.push({ type: "slash" });
|
||||||
|
break;
|
||||||
|
case "%":
|
||||||
|
tokens.push({ type: "percent" });
|
||||||
|
break;
|
||||||
|
case "^":
|
||||||
|
tokens.push({ type: "caret" });
|
||||||
|
break;
|
||||||
|
case "!":
|
||||||
|
tokens.push({ type: "bang" });
|
||||||
|
break;
|
||||||
|
case "(":
|
||||||
|
case "[":
|
||||||
|
case "{":
|
||||||
|
tokens.push({ type: "leftParen" });
|
||||||
|
break;
|
||||||
|
case ")":
|
||||||
|
case "]":
|
||||||
|
case "}":
|
||||||
|
tokens.push({ type: "rightParen" });
|
||||||
|
break;
|
||||||
|
case "|":
|
||||||
|
tokens.push({ type: "pipe" });
|
||||||
|
break;
|
||||||
|
case ",":
|
||||||
|
tokens.push({ type: "comma" });
|
||||||
|
break;
|
||||||
|
case "=":
|
||||||
|
// "==" from a typed source is still equality.
|
||||||
|
if (index + 1 < characters.length && characters[index + 1] === "=") index += 1;
|
||||||
|
tokens.push({ type: "relation", relation: "=" });
|
||||||
|
break;
|
||||||
|
case "<":
|
||||||
|
if (index + 1 < characters.length && characters[index + 1] === "=") {
|
||||||
|
tokens.push({ type: "relation", relation: "<=" });
|
||||||
|
index += 1;
|
||||||
|
} else {
|
||||||
|
tokens.push({ type: "relation", relation: "<" });
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ">":
|
||||||
|
if (index + 1 < characters.length && characters[index + 1] === "=") {
|
||||||
|
tokens.push({ type: "relation", relation: ">=" });
|
||||||
|
index += 1;
|
||||||
|
} else {
|
||||||
|
tokens.push({ type: "relation", relation: ">" });
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case "≤":
|
||||||
|
tokens.push({ type: "relation", relation: "<=" });
|
||||||
|
break;
|
||||||
|
case "≥":
|
||||||
|
tokens.push({ type: "relation", relation: ">=" });
|
||||||
|
break;
|
||||||
|
case "√":
|
||||||
|
tokens.push({ type: "identifier", name: "sqrt" });
|
||||||
|
break;
|
||||||
|
case "π":
|
||||||
|
tokens.push({ type: "identifier", name: "pi" });
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new MathParseError({ kind: "unexpectedCharacter", character }, input);
|
||||||
|
}
|
||||||
|
index += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokens.length === 0) throw new MathParseError({ kind: "emptyInput" }, input);
|
||||||
|
return tokens;
|
||||||
|
}
|
||||||
@@ -0,0 +1,362 @@
|
|||||||
|
// A numeric literal that stays exact for as long as it can. Rationals rather
|
||||||
|
// than floats everywhere is the difference between a step-by-step solution
|
||||||
|
// that reads `x = 3/2` and one that reads `x = 1.5`, and between
|
||||||
|
// `1/3 + 1/3 + 1/3 = 1` and `0.9999999999999999`. Anything genuinely
|
||||||
|
// irrational (a square root, a sine) degrades to `real` and stays there.
|
||||||
|
//
|
||||||
|
// Number.isSafeInteger is the overflow guard: an operation whose exact
|
||||||
|
// result leaves the safe-integer range falls back to a `real` value rather
|
||||||
|
// than silently losing precision.
|
||||||
|
|
||||||
|
export type MathNumber =
|
||||||
|
| { kind: "integer"; value: number }
|
||||||
|
| { kind: "rational"; n: number; d: number }
|
||||||
|
| { kind: "real"; value: number };
|
||||||
|
|
||||||
|
export function integer(value: number): MathNumber {
|
||||||
|
return { kind: "integer", value };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function real(value: number): MathNumber {
|
||||||
|
return { kind: "real", value };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Always stored normalised: `d > 1`, sign on the numerator, gcd(n, d) === 1.
|
||||||
|
* Construct rationals only through here.
|
||||||
|
*/
|
||||||
|
export function rational(numerator: number, denominator: number): MathNumber {
|
||||||
|
if (denominator === 0) return real(NaN);
|
||||||
|
if (!Number.isSafeInteger(numerator) || !Number.isSafeInteger(denominator)) {
|
||||||
|
return real(numerator / denominator);
|
||||||
|
}
|
||||||
|
let n = numerator;
|
||||||
|
let d = denominator;
|
||||||
|
if (d < 0) {
|
||||||
|
n = -n;
|
||||||
|
d = -d;
|
||||||
|
}
|
||||||
|
const divisor = greatestCommonDivisor(Math.abs(n), d);
|
||||||
|
if (divisor > 1) {
|
||||||
|
n /= divisor;
|
||||||
|
d /= divisor;
|
||||||
|
}
|
||||||
|
return d === 1 ? integer(n) : { kind: "rational", n, d };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recover an exact rational from a decimal literal so `0.25` behaves like
|
||||||
|
* `1/4` in later arithmetic. Bounded denominator: beyond that the value is
|
||||||
|
* almost certainly a measurement rather than a fraction, and pretending
|
||||||
|
* otherwise produces absurd numerators. (Stern-Brocot search.)
|
||||||
|
*/
|
||||||
|
export function fromDecimal(value: number, maximumDenominator = 1_000_000): MathNumber {
|
||||||
|
if (!Number.isFinite(value)) return real(value);
|
||||||
|
if (value === Math.round(value) && Number.isSafeInteger(value)) {
|
||||||
|
return integer(value);
|
||||||
|
}
|
||||||
|
let lowerN = 0;
|
||||||
|
let lowerD = 1;
|
||||||
|
let upperN = 1;
|
||||||
|
let upperD = 0;
|
||||||
|
const negative = value < 0;
|
||||||
|
const target = Math.abs(value);
|
||||||
|
for (let iterations = 0; iterations < 64; iterations++) {
|
||||||
|
const mediantN = lowerN + upperN;
|
||||||
|
const mediantD = lowerD + upperD;
|
||||||
|
if (mediantD > maximumDenominator) break;
|
||||||
|
const mediant = mediantN / mediantD;
|
||||||
|
if (Math.abs(mediant - target) < 1e-12) {
|
||||||
|
return rational(negative ? -mediantN : mediantN, mediantD);
|
||||||
|
}
|
||||||
|
if (mediant < target) {
|
||||||
|
lowerN = mediantN;
|
||||||
|
lowerD = mediantD;
|
||||||
|
} else {
|
||||||
|
upperN = mediantN;
|
||||||
|
upperD = mediantD;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return real(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Inspection
|
||||||
|
|
||||||
|
export function doubleValue(value: MathNumber): number {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return value.value;
|
||||||
|
case "rational":
|
||||||
|
return value.n / value.d;
|
||||||
|
case "real":
|
||||||
|
return value.value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isZero(value: MathNumber): boolean {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return value.value === 0;
|
||||||
|
case "rational":
|
||||||
|
return value.n === 0;
|
||||||
|
case "real":
|
||||||
|
return value.value === 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isOne(value: MathNumber): boolean {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return value.value === 1;
|
||||||
|
case "rational":
|
||||||
|
return false; // normalised, so never 1
|
||||||
|
case "real":
|
||||||
|
return value.value === 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isNegative(value: MathNumber): boolean {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return value.value < 0;
|
||||||
|
case "rational":
|
||||||
|
return value.n < 0;
|
||||||
|
case "real":
|
||||||
|
return value.value < 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isExact(value: MathNumber): boolean {
|
||||||
|
return value.kind !== "real";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isInteger(value: MathNumber): boolean {
|
||||||
|
return value.kind === "integer";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function integerValue(value: MathNumber): number | null {
|
||||||
|
return value.kind === "integer" ? value.value : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function asFraction(value: MathNumber): [number, number] | null {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return [value.value, 1];
|
||||||
|
case "rational":
|
||||||
|
return [value.n, value.d];
|
||||||
|
case "real":
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Arithmetic
|
||||||
|
//
|
||||||
|
// Exactness is preserved whenever both operands are exact; a single `real`
|
||||||
|
// anywhere makes the whole result `real`. Overflow falls back to `real`
|
||||||
|
// rather than trapping — a solver exploring a bad branch must not crash the
|
||||||
|
// app on the wearer's face.
|
||||||
|
|
||||||
|
function safeProducts(...values: number[]): boolean {
|
||||||
|
return values.every((value) => Number.isSafeInteger(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function add(lhs: MathNumber, rhs: MathNumber): MathNumber {
|
||||||
|
const left = asFraction(lhs);
|
||||||
|
const right = asFraction(rhs);
|
||||||
|
if (!left || !right) return real(doubleValue(lhs) + doubleValue(rhs));
|
||||||
|
const [ln, ld] = left;
|
||||||
|
const [rn, rd] = right;
|
||||||
|
const crossLeft = ln * rd;
|
||||||
|
const crossRight = rn * ld;
|
||||||
|
const numerator = crossLeft + crossRight;
|
||||||
|
const denominator = ld * rd;
|
||||||
|
if (!safeProducts(crossLeft, crossRight, numerator, denominator)) {
|
||||||
|
return real(doubleValue(lhs) + doubleValue(rhs));
|
||||||
|
}
|
||||||
|
return rational(numerator, denominator);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function subtract(lhs: MathNumber, rhs: MathNumber): MathNumber {
|
||||||
|
return add(lhs, negated(rhs));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function multiply(lhs: MathNumber, rhs: MathNumber): MathNumber {
|
||||||
|
const left = asFraction(lhs);
|
||||||
|
const right = asFraction(rhs);
|
||||||
|
if (!left || !right) return real(doubleValue(lhs) * doubleValue(rhs));
|
||||||
|
const [ln, ld] = left;
|
||||||
|
const [rn, rd] = right;
|
||||||
|
const numerator = ln * rn;
|
||||||
|
const denominator = ld * rd;
|
||||||
|
if (!safeProducts(numerator, denominator)) {
|
||||||
|
return real(doubleValue(lhs) * doubleValue(rhs));
|
||||||
|
}
|
||||||
|
return rational(numerator, denominator);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function divide(lhs: MathNumber, rhs: MathNumber): MathNumber {
|
||||||
|
if (isZero(rhs)) return real(doubleValue(lhs) / doubleValue(rhs));
|
||||||
|
const left = asFraction(lhs);
|
||||||
|
const right = asFraction(rhs);
|
||||||
|
if (!left || !right) return real(doubleValue(lhs) / doubleValue(rhs));
|
||||||
|
const [ln, ld] = left;
|
||||||
|
const [rn, rd] = right;
|
||||||
|
const numerator = ln * rd;
|
||||||
|
const denominator = ld * rn;
|
||||||
|
if (!safeProducts(numerator, denominator)) {
|
||||||
|
return real(doubleValue(lhs) / doubleValue(rhs));
|
||||||
|
}
|
||||||
|
return rational(numerator, denominator);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function negated(value: MathNumber): MathNumber {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return integer(-value.value);
|
||||||
|
case "rational":
|
||||||
|
return { kind: "rational", n: -value.n, d: value.d };
|
||||||
|
case "real":
|
||||||
|
return real(-value.value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function reciprocal(value: MathNumber): MathNumber {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return rational(1, value.value);
|
||||||
|
case "rational":
|
||||||
|
return rational(value.d, value.n);
|
||||||
|
case "real":
|
||||||
|
return real(1 / value.value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Exact only when the result stays rational — an integer exponent, or a
|
||||||
|
* perfect root. `2^0.5` is irrational, so it becomes `real`.
|
||||||
|
*/
|
||||||
|
export function raisedTo(base: MathNumber, exponent: MathNumber): MathNumber {
|
||||||
|
const fraction = asFraction(base);
|
||||||
|
const power = integerValue(exponent);
|
||||||
|
if (power !== null && fraction) {
|
||||||
|
const [n, d] = fraction;
|
||||||
|
if (power >= 0 && power < 64) {
|
||||||
|
let numerator = 1;
|
||||||
|
let denominator = 1;
|
||||||
|
let overflow = false;
|
||||||
|
for (let step = 0; step < power; step++) {
|
||||||
|
numerator *= n;
|
||||||
|
denominator *= d;
|
||||||
|
if (!safeProducts(numerator, denominator)) {
|
||||||
|
overflow = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!overflow) return rational(numerator, denominator);
|
||||||
|
} else if (power < 0 && power > -64 && !isZero(base)) {
|
||||||
|
return raisedTo(reciprocal(base), integer(-power));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// An exact root of a perfect power stays exact: sqrt(9/4) = 3/2.
|
||||||
|
if (exponent.kind === "rational" && exponent.d === 2 && exponent.n === 1 && fraction) {
|
||||||
|
const [n, d] = fraction;
|
||||||
|
if (n >= 0) {
|
||||||
|
const rootN = Math.round(Math.sqrt(n));
|
||||||
|
const rootD = Math.round(Math.sqrt(d));
|
||||||
|
if (rootN * rootN === n && rootD * rootD === d) return rational(rootN, rootD);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return real(Math.pow(doubleValue(base), doubleValue(exponent)));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function greatestCommonDivisor(a: number, b: number): number {
|
||||||
|
let x = Math.abs(a);
|
||||||
|
let y = Math.abs(b);
|
||||||
|
while (y !== 0) {
|
||||||
|
const next = x % y;
|
||||||
|
x = y;
|
||||||
|
y = next;
|
||||||
|
}
|
||||||
|
return x === 0 ? 1 : x;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Comparison
|
||||||
|
|
||||||
|
export function lessThan(lhs: MathNumber, rhs: MathNumber): boolean {
|
||||||
|
return doubleValue(lhs) < doubleValue(rhs);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Structural equality would make `integer(1)` differ from `real(1)`, which
|
||||||
|
* breaks simplification against numbers that came back from a numeric path.
|
||||||
|
* Compare by value instead, with a tolerance for reals.
|
||||||
|
*/
|
||||||
|
export function numberEquals(lhs: MathNumber, rhs: MathNumber): boolean {
|
||||||
|
const left = asFraction(lhs);
|
||||||
|
const right = asFraction(rhs);
|
||||||
|
if (left && right) return left[0] === right[0] && left[1] === right[1];
|
||||||
|
const a = doubleValue(lhs);
|
||||||
|
const b = doubleValue(rhs);
|
||||||
|
if (a === b) return true;
|
||||||
|
const scale = Math.max(Math.abs(a), Math.abs(b), 1);
|
||||||
|
return Math.abs(a - b) <= 1e-12 * scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Display
|
||||||
|
|
||||||
|
/** Plain-text form for the glasses and for spoken readback. */
|
||||||
|
export function describeNumber(value: MathNumber): string {
|
||||||
|
switch (value.kind) {
|
||||||
|
case "integer":
|
||||||
|
return String(value.value);
|
||||||
|
case "rational":
|
||||||
|
return `${value.n}/${value.d}`;
|
||||||
|
case "real": {
|
||||||
|
const raw = value.value;
|
||||||
|
if (Number.isNaN(raw)) return "NaN";
|
||||||
|
if (raw === Math.round(raw) && Math.abs(raw) < 1e15) {
|
||||||
|
return String(Math.round(raw));
|
||||||
|
}
|
||||||
|
// Trim to something a person can read aloud, without exponent notation
|
||||||
|
// for ordinary magnitudes.
|
||||||
|
if (Math.abs(raw) >= 1e-4 && Math.abs(raw) < 1e9) {
|
||||||
|
let text = raw.toFixed(6);
|
||||||
|
while (text.endsWith("0")) text = text.slice(0, -1);
|
||||||
|
if (text.endsWith(".")) text = text.slice(0, -1);
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
return formatG(raw);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Approximates C's %g: shortest of decimal/exponent form at 6 significant digits. */
|
||||||
|
function formatG(value: number): string {
|
||||||
|
if (value === 0) return "0";
|
||||||
|
const exponent = Math.floor(Math.log10(Math.abs(value)));
|
||||||
|
if (exponent >= -4 && exponent < 6) {
|
||||||
|
const text = value.toPrecision(6);
|
||||||
|
return trimTrailingZeros(text);
|
||||||
|
}
|
||||||
|
const mantissa = trimTrailingZeros((value / Math.pow(10, exponent)).toPrecision(6));
|
||||||
|
const sign = exponent >= 0 ? "+" : "-";
|
||||||
|
const padded = String(Math.abs(exponent)).padStart(2, "0");
|
||||||
|
return `${mantissa}e${sign}${padded}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function trimTrailingZeros(text: string): string {
|
||||||
|
if (!text.includes(".")) return text;
|
||||||
|
let result = text;
|
||||||
|
while (result.endsWith("0")) result = result.slice(0, -1);
|
||||||
|
if (result.endsWith(".")) result = result.slice(0, -1);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Thousands-separated integer. */
|
||||||
|
export function formatInt(value: number): string {
|
||||||
|
return Math.round(value).toLocaleString("en-US");
|
||||||
|
}
|
||||||
@@ -0,0 +1,509 @@
|
|||||||
|
// Turns a spoken utterance into something the parser can read. ASR does not
|
||||||
|
// emit `2x^2 + 3x - 5 = 0`; it emits "two x squared plus three x minus five
|
||||||
|
// equals zero", and on a bad pass "2 x squared plus 3x minus 5 = 0". Every
|
||||||
|
// rule here exists because one of those shapes has to land on the same tree.
|
||||||
|
//
|
||||||
|
// Deliberately NOT an LLM pass: a misheard equation should fail visibly at
|
||||||
|
// the parser rather than be silently "corrected" into a different problem.
|
||||||
|
|
||||||
|
import { ALL_CONSTANTS, ALL_FUNCTIONS } from "./expression";
|
||||||
|
|
||||||
|
export function normalizeSpoken(raw: string): string {
|
||||||
|
let text = raw
|
||||||
|
.normalize("NFD")
|
||||||
|
.replace(/[\u0300-\u036f]/g, "")
|
||||||
|
.toLowerCase()
|
||||||
|
.replace(/’/g, "'");
|
||||||
|
|
||||||
|
text = stripTrailingDiscourse(text);
|
||||||
|
text = stripPreamble(text);
|
||||||
|
text = applyPhrases(text, FUNCTION_PHRASES);
|
||||||
|
text = applyPhrases(text, RELATION_PHRASES);
|
||||||
|
text = applyPhrases(text, OPERATOR_PHRASES);
|
||||||
|
// Number words BEFORE powers: "two to the power of five" must become
|
||||||
|
// "2 to the power of 5" first, or the power rule collapses it to
|
||||||
|
// "two^five" and the parser sees two variables. Ordinals ("fifth") are
|
||||||
|
// untouched by the number pass, so "to the fifth" still resolves after.
|
||||||
|
text = applyNumberWords(text);
|
||||||
|
text = applyPowerPhrases(text);
|
||||||
|
text = applyFractionPhrases(text);
|
||||||
|
text = applyPhrases(text, CONSTANT_PHRASES);
|
||||||
|
text = collapseDigitGroups(text);
|
||||||
|
text = insertImplicitMultiplication(text);
|
||||||
|
|
||||||
|
return text.replace(/\s+/g, " ").trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Preamble
|
||||||
|
|
||||||
|
const TRAILING_PUNCTUATION = /^[ .,!?;:]+|[ .,!?;:]+$/g;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove terminal speech-recognition filler that is not part of the problem.
|
||||||
|
*
|
||||||
|
* Always-on transcription commonly finalizes a valid equation together with
|
||||||
|
* the next conversational beat (`3x plus 1. Thank you.`). Leaving that suffix
|
||||||
|
* attached makes the deterministic parser reject otherwise complete
|
||||||
|
* arithmetic and sends the calculator through its optional model-rewrite
|
||||||
|
* fallback — turning an offline feature into an API-key error for users
|
||||||
|
* without a cloud provider configured.
|
||||||
|
*/
|
||||||
|
export function stripTrailingDiscourse(text: string): string {
|
||||||
|
const phrases = ["thank you", "thanks", "please", "okay", "ok"].sort((a, b) => b.length - a.length);
|
||||||
|
let result = text.replace(TRAILING_PUNCTUATION, "");
|
||||||
|
let changed = true;
|
||||||
|
while (changed) {
|
||||||
|
changed = false;
|
||||||
|
for (const phrase of phrases) {
|
||||||
|
if (result === phrase) {
|
||||||
|
result = "";
|
||||||
|
changed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
const suffix = " " + phrase;
|
||||||
|
if (result.endsWith(suffix)) {
|
||||||
|
result = result.slice(0, -suffix.length).replace(TRAILING_PUNCTUATION, "");
|
||||||
|
changed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "solve two x plus one equals five" → "two x plus one equals five". The
|
||||||
|
* command word is consumed by the caller (it chooses the mode); what reaches
|
||||||
|
* the parser must be only the mathematics.
|
||||||
|
*/
|
||||||
|
const PREAMBLES = [
|
||||||
|
"can you solve",
|
||||||
|
"please solve",
|
||||||
|
"solve for me",
|
||||||
|
"work out",
|
||||||
|
"figure out",
|
||||||
|
"calculate",
|
||||||
|
"compute",
|
||||||
|
"evaluate",
|
||||||
|
"simplify",
|
||||||
|
"solve",
|
||||||
|
"what is",
|
||||||
|
"whats",
|
||||||
|
"what's",
|
||||||
|
"how much is",
|
||||||
|
"tell me",
|
||||||
|
"the answer to",
|
||||||
|
"the equation",
|
||||||
|
"the expression",
|
||||||
|
"graph",
|
||||||
|
"plot",
|
||||||
|
].sort((a, b) => b.length - a.length);
|
||||||
|
|
||||||
|
export function stripPreamble(text: string): string {
|
||||||
|
let result = text.trim();
|
||||||
|
let changed = true;
|
||||||
|
// Loop: "can you solve what is 2 plus 2" has two stacked preambles.
|
||||||
|
while (changed) {
|
||||||
|
changed = false;
|
||||||
|
for (const preamble of PREAMBLES) {
|
||||||
|
if (result.startsWith(preamble + " ")) {
|
||||||
|
result = result.slice(preamble.length + 1);
|
||||||
|
changed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Phrase tables
|
||||||
|
|
||||||
|
function escapeRegExp(text: string): string {
|
||||||
|
return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Longest-first replacement. "less than or equal to" must be tried before
|
||||||
|
* "less than", or the tail becomes a stray "or equal to".
|
||||||
|
*/
|
||||||
|
function applyPhrases(text: string, phrases: readonly [string, string][]): string {
|
||||||
|
let result = text;
|
||||||
|
const sorted = [...phrases].sort((a, b) => b[0].length - a[0].length);
|
||||||
|
for (const [phrase, replacement] of sorted) {
|
||||||
|
result = result.replace(new RegExp(`\\b${escapeRegExp(phrase)}\\b`, "g"), replacement);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
const RELATION_PHRASES: readonly [string, string][] = [
|
||||||
|
["is less than or equal to", "<="],
|
||||||
|
["less than or equal to", "<="],
|
||||||
|
["is greater than or equal to", ">="],
|
||||||
|
["greater than or equal to", ">="],
|
||||||
|
["is at most", "<="],
|
||||||
|
["at most", "<="],
|
||||||
|
["is at least", ">="],
|
||||||
|
["at least", ">="],
|
||||||
|
["is less than", "<"],
|
||||||
|
["less than", "<"],
|
||||||
|
["is greater than", ">"],
|
||||||
|
["greater than", ">"],
|
||||||
|
["is equal to", "="],
|
||||||
|
["equal to", "="],
|
||||||
|
["equals", "="],
|
||||||
|
["is the same as", "="],
|
||||||
|
];
|
||||||
|
|
||||||
|
const OPERATOR_PHRASES: readonly [string, string][] = [
|
||||||
|
["multiplied by", "*"],
|
||||||
|
["times", "*"],
|
||||||
|
["product of", "*"],
|
||||||
|
["divided by", "/"],
|
||||||
|
["over", "/"],
|
||||||
|
["split by", "/"],
|
||||||
|
["plus", "+"],
|
||||||
|
["added to", "+"],
|
||||||
|
["and then add", "+"],
|
||||||
|
["minus", "-"],
|
||||||
|
["subtract", "-"],
|
||||||
|
["take away", "-"],
|
||||||
|
["less", "-"],
|
||||||
|
["modulo", "%"],
|
||||||
|
["mod", "%"],
|
||||||
|
["open paren", "("],
|
||||||
|
["open parenthesis", "("],
|
||||||
|
["open bracket", "("],
|
||||||
|
["close paren", ")"],
|
||||||
|
["close parenthesis", ")"],
|
||||||
|
["close bracket", ")"],
|
||||||
|
["negative", "-"],
|
||||||
|
["minus sign", "-"],
|
||||||
|
// "15 percent of 240" is 15/100 × 240. Mapping `percent` to the modulo
|
||||||
|
// operator (which shares the glyph) turned every percentage question into a
|
||||||
|
// remainder question — 15 % 240 = 15, silently wrong.
|
||||||
|
["percent of", "/100 *"],
|
||||||
|
["percent", "/100"],
|
||||||
|
];
|
||||||
|
|
||||||
|
const FUNCTION_PHRASES: readonly [string, string][] = [
|
||||||
|
["square root of", "sqrt"],
|
||||||
|
["the square root of", "sqrt"],
|
||||||
|
["root of", "sqrt"],
|
||||||
|
["cube root of", "cbrt"],
|
||||||
|
["natural log of", "ln"],
|
||||||
|
["natural log", "ln"],
|
||||||
|
["log base ten of", "log10"],
|
||||||
|
["log base 10 of", "log10"],
|
||||||
|
["log base two of", "log2"],
|
||||||
|
["log base 2 of", "log2"],
|
||||||
|
["log of", "log10"],
|
||||||
|
["absolute value of", "abs"],
|
||||||
|
["the absolute value of", "abs"],
|
||||||
|
["sine of", "sin"],
|
||||||
|
["cosine of", "cos"],
|
||||||
|
["tangent of", "tan"],
|
||||||
|
["arc sine of", "asin"],
|
||||||
|
["arc cosine of", "acos"],
|
||||||
|
["arc tangent of", "atan"],
|
||||||
|
["inverse sine of", "asin"],
|
||||||
|
["inverse cosine of", "acos"],
|
||||||
|
["inverse tangent of", "atan"],
|
||||||
|
["factorial of", "factorial"],
|
||||||
|
["e to the power of", "exp"],
|
||||||
|
];
|
||||||
|
|
||||||
|
const CONSTANT_PHRASES: readonly [string, string][] = [
|
||||||
|
["pi", "pi"],
|
||||||
|
["tau", "tau"],
|
||||||
|
["euler's number", "e"],
|
||||||
|
["eulers number", "e"],
|
||||||
|
];
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Powers
|
||||||
|
|
||||||
|
/** "x squared", "x to the power of three", "x cubed", "two to the fifth". */
|
||||||
|
export function applyPowerPhrases(text: string): string {
|
||||||
|
let result = text;
|
||||||
|
const ordinalPowers: readonly [string, string][] = [
|
||||||
|
["squared", "^2"],
|
||||||
|
["cubed", "^3"],
|
||||||
|
];
|
||||||
|
for (const [phrase, replacement] of ordinalPowers) {
|
||||||
|
result = result.replace(new RegExp(`\\s*\\b${phrase}\\b`, "g"), replacement);
|
||||||
|
}
|
||||||
|
// "to the power of N" / "to the N power" / "to the N"
|
||||||
|
for (const pattern of [
|
||||||
|
/\s*to the power of\s+/g,
|
||||||
|
/\s*raised to the power of\s+/g,
|
||||||
|
/\s*raised to\s+/g,
|
||||||
|
/\s*to the\s+(?=[0-9])/g,
|
||||||
|
]) {
|
||||||
|
result = result.replace(pattern, "^");
|
||||||
|
}
|
||||||
|
// Ordinal exponents: "to the fifth" was normalised to "^fifth" above.
|
||||||
|
const ordinals: readonly [string, string][] = [
|
||||||
|
["first", "1"],
|
||||||
|
["second", "2"],
|
||||||
|
["third", "3"],
|
||||||
|
["fourth", "4"],
|
||||||
|
["fifth", "5"],
|
||||||
|
["sixth", "6"],
|
||||||
|
["seventh", "7"],
|
||||||
|
["eighth", "8"],
|
||||||
|
["ninth", "9"],
|
||||||
|
["tenth", "10"],
|
||||||
|
];
|
||||||
|
for (const [word, digit] of ordinals) {
|
||||||
|
result = result.replace(new RegExp(`\\^\\s*${word}(\\s+power)?\\b`, "g"), `^${digit}`);
|
||||||
|
result = result.replace(new RegExp(`\\s*to the ${word}(\\s+power)?\\b`, "g"), `^${digit}`);
|
||||||
|
}
|
||||||
|
// Postfix "seven factorial" — the function table only covers the prefix
|
||||||
|
// form ("factorial of seven").
|
||||||
|
result = result.replace(/(\d+|\))\s*\bfactorial\b/g, "$1!");
|
||||||
|
return result.replace(/\^\s+/g, "^");
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Fractions
|
||||||
|
|
||||||
|
/** "three over four", "two thirds", "one half". */
|
||||||
|
export function applyFractionPhrases(text: string): string {
|
||||||
|
let result = text;
|
||||||
|
const denominators: readonly [string, number][] = [
|
||||||
|
["halves", 2],
|
||||||
|
["half", 2],
|
||||||
|
["thirds", 3],
|
||||||
|
["third", 3],
|
||||||
|
["quarters", 4],
|
||||||
|
["quarter", 4],
|
||||||
|
["fourths", 4],
|
||||||
|
["fourth", 4],
|
||||||
|
["fifths", 5],
|
||||||
|
["fifth", 5],
|
||||||
|
["sixths", 6],
|
||||||
|
["sixth", 6],
|
||||||
|
["eighths", 8],
|
||||||
|
["eighth", 8],
|
||||||
|
["tenths", 10],
|
||||||
|
["tenth", 10],
|
||||||
|
];
|
||||||
|
for (const [word, denominator] of denominators) {
|
||||||
|
// Only when a number precedes it — "a third of the guests" is not
|
||||||
|
// arithmetic, but "two thirds" is.
|
||||||
|
result = result.replace(new RegExp(`\\b(\\d+)\\s+${word}\\b`, "g"), `($1/${denominator})`);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Number words
|
||||||
|
|
||||||
|
const UNITS: readonly [string, number][] = [
|
||||||
|
["zero", 0],
|
||||||
|
["one", 1],
|
||||||
|
["two", 2],
|
||||||
|
["three", 3],
|
||||||
|
["four", 4],
|
||||||
|
["five", 5],
|
||||||
|
["six", 6],
|
||||||
|
["seven", 7],
|
||||||
|
["eight", 8],
|
||||||
|
["nine", 9],
|
||||||
|
["ten", 10],
|
||||||
|
["eleven", 11],
|
||||||
|
["twelve", 12],
|
||||||
|
["thirteen", 13],
|
||||||
|
["fourteen", 14],
|
||||||
|
["fifteen", 15],
|
||||||
|
["sixteen", 16],
|
||||||
|
["seventeen", 17],
|
||||||
|
["eighteen", 18],
|
||||||
|
["nineteen", 19],
|
||||||
|
];
|
||||||
|
|
||||||
|
const TENS: readonly [string, number][] = [
|
||||||
|
["twenty", 20],
|
||||||
|
["thirty", 30],
|
||||||
|
["forty", 40],
|
||||||
|
["fifty", 50],
|
||||||
|
["sixty", 60],
|
||||||
|
["seventy", 70],
|
||||||
|
["eighty", 80],
|
||||||
|
["ninety", 90],
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fold English number words into digits, including compounds
|
||||||
|
* ("twenty five" → 25, "three hundred" → 300, "two thousand ten" → 2010).
|
||||||
|
*/
|
||||||
|
export function applyNumberWords(text: string): string {
|
||||||
|
const tokens = text.split(/\s+/).filter((token) => token.length > 0);
|
||||||
|
const output: string[] = [];
|
||||||
|
let index = 0;
|
||||||
|
|
||||||
|
while (index < tokens.length) {
|
||||||
|
const [value, consumed] = parseNumberPhrase(tokens, index);
|
||||||
|
if (value !== null && consumed > 0) {
|
||||||
|
output.push(String(value));
|
||||||
|
index += consumed;
|
||||||
|
} else {
|
||||||
|
output.push(tokens[index]!);
|
||||||
|
index += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return output.join(" ");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What the previous token was, which is what decides whether the next one
|
||||||
|
* continues the same number or starts a new one. "twenty five" is 25;
|
||||||
|
* "five five" is two numbers; "one hundred forty four" is 144.
|
||||||
|
*/
|
||||||
|
type NumberTokenKind = "none" | "unit" | "ten" | "hundred" | "scale";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Greedy left-to-right accumulation with scale words. Returns [null, 0] when
|
||||||
|
* the token at `start` does not begin a number phrase.
|
||||||
|
*/
|
||||||
|
function parseNumberPhrase(tokens: string[], start: number): [number | null, number] {
|
||||||
|
let total = 0;
|
||||||
|
let current = 0;
|
||||||
|
let consumed = 0;
|
||||||
|
let matchedAnything = false;
|
||||||
|
let previous: NumberTokenKind = "none";
|
||||||
|
|
||||||
|
let index = start;
|
||||||
|
while (index < tokens.length) {
|
||||||
|
const token = tokens[index]!.replace(/^[,-]+|[,-]+$/g, "");
|
||||||
|
const unit = UNITS.find(([word]) => word === token)?.[1];
|
||||||
|
const ten = TENS.find(([word]) => word === token)?.[1];
|
||||||
|
|
||||||
|
if (unit !== undefined) {
|
||||||
|
// A unit may follow a ten ("twenty five"), a hundred ("a hundred
|
||||||
|
// four"), or a scale ("two thousand ten") — but not another unit, which
|
||||||
|
// is two separate numbers.
|
||||||
|
if (previous === "unit") break;
|
||||||
|
current += unit;
|
||||||
|
previous = "unit";
|
||||||
|
} else if (ten !== undefined) {
|
||||||
|
// After "hundred", `current` is non-zero; bailing there turned
|
||||||
|
// "one hundred forty four" into "100 44".
|
||||||
|
if (previous !== "none" && previous !== "hundred" && previous !== "scale") break;
|
||||||
|
current += ten;
|
||||||
|
previous = "ten";
|
||||||
|
} else if (token === "hundred") {
|
||||||
|
if (previous !== "unit" && previous !== "ten" && previous !== "none") break;
|
||||||
|
if (current === 0) current = 1;
|
||||||
|
current *= 100;
|
||||||
|
previous = "hundred";
|
||||||
|
} else if (token === "thousand" || token === "million") {
|
||||||
|
const scale = token === "thousand" ? 1_000 : 1_000_000;
|
||||||
|
if (current === 0 && total === 0) current = 1;
|
||||||
|
total += current * scale;
|
||||||
|
current = 0;
|
||||||
|
previous = "scale";
|
||||||
|
} else if (token === "and" && matchedAnything && index + 1 < tokens.length && isNumberWord(tokens[index + 1]!)) {
|
||||||
|
// "three hundred and five" — but a bare "and" elsewhere is not part of
|
||||||
|
// the number.
|
||||||
|
index += 1;
|
||||||
|
consumed += 1;
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
matchedAnything = true;
|
||||||
|
index += 1;
|
||||||
|
consumed += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!matchedAnything) return [null, 0];
|
||||||
|
return [total + current, consumed];
|
||||||
|
}
|
||||||
|
|
||||||
|
function isNumberWord(token: string): boolean {
|
||||||
|
const cleaned = token.replace(/^[,-]+|[,-]+$/g, "");
|
||||||
|
return (
|
||||||
|
UNITS.some(([word]) => word === cleaned) ||
|
||||||
|
TENS.some(([word]) => word === cleaned) ||
|
||||||
|
["hundred", "thousand", "million"].includes(cleaned)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Digit groups
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ASR renders a dictated "four hundred and five" that it already digitised as
|
||||||
|
* "4 05" or "400 5". The first is a spacing artefact and joins; the second is
|
||||||
|
* genuinely ambiguous and is left alone.
|
||||||
|
*/
|
||||||
|
export function collapseDigitGroups(text: string): string {
|
||||||
|
return text.replace(/\b(\d+)\s+(0\d+)\b/g, "$1$2");
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Implicit multiplication
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Names the implicit-multiplication repair must not split.
|
||||||
|
*/
|
||||||
|
export const RESERVED_WORDS: readonly string[] = [...ALL_FUNCTIONS, ...ALL_CONSTANTS, "log", "sqrt"];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The subset that is CALLED, so a star between the name and its opening paren
|
||||||
|
* is an artefact of the implicit-multiplication rules rather than a real
|
||||||
|
* operator. Constants are excluded deliberately: `pi*(r+1)` must keep its
|
||||||
|
* multiplication.
|
||||||
|
*/
|
||||||
|
export const RESERVED_FUNCTION_NAMES: readonly string[] = [...ALL_FUNCTIONS, "log", "sqrt"];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "2x" and "3(x+1)" and "2 x" all mean multiplication. Inserting the `*` here
|
||||||
|
* rather than in the parser keeps the grammar unambiguous, and makes the
|
||||||
|
* normalised string something a wearer can read back and verify.
|
||||||
|
*/
|
||||||
|
export function insertImplicitMultiplication(text: string): string {
|
||||||
|
let result = text;
|
||||||
|
const rules: readonly [RegExp, string][] = [
|
||||||
|
// number followed by a letter or an opening paren: 2x, 2(
|
||||||
|
[/(\d)\s*([a-z(])/g, "$1*$2"],
|
||||||
|
// closing paren followed by a number, letter, or paren: )x, )2, )(
|
||||||
|
[/(\))\s*([a-z0-9(])/g, "$1*$2"],
|
||||||
|
// a single-letter variable immediately followed by a paren
|
||||||
|
[/(?<![a-z])([a-z])\s*(\()/g, "$1*$2"],
|
||||||
|
];
|
||||||
|
for (const [pattern, replacement] of rules) {
|
||||||
|
result = result.replace(pattern, replacement);
|
||||||
|
}
|
||||||
|
// The rules above will happily turn `sqrt(x)` into `sqr*t*(x)` and `2*x`
|
||||||
|
// inside a known function name; repair the known names.
|
||||||
|
//
|
||||||
|
// The optional star belongs strictly BETWEEN the characters of a word.
|
||||||
|
// Appending one after the final character too (`p\*?i\*?` for `pi`) made
|
||||||
|
// the repair swallow a legitimate operator that merely FOLLOWED the word:
|
||||||
|
// `2*pi*r` became `2*pir`, which then parsed as three unbound variables and
|
||||||
|
// silently produced a different answer.
|
||||||
|
//
|
||||||
|
// A function name immediately before its opening paren is the one
|
||||||
|
// exception: the rules above rewrite `sqrt(x)` to `sqr*t*(x)`, so that
|
||||||
|
// trailing star really is spurious. A CONSTANT is never called, so a star
|
||||||
|
// after `pi` or `e` is always a real multiplication — `pi*(r+1)` has to
|
||||||
|
// keep it. Run the narrower function rule first, then the general
|
||||||
|
// between-characters repair over everything.
|
||||||
|
for (const name of RESERVED_FUNCTION_NAMES) {
|
||||||
|
if (name.length <= 1) continue;
|
||||||
|
const pattern = name.split("").join("\\*?") + "\\*?(?=\\()";
|
||||||
|
result = result.replace(new RegExp(pattern, "g"), name);
|
||||||
|
}
|
||||||
|
for (const name of RESERVED_WORDS) {
|
||||||
|
// A single-character constant such as `e` has nothing to repair between
|
||||||
|
// characters, so it is skipped entirely.
|
||||||
|
if (name.length <= 1) continue;
|
||||||
|
const pattern = name.split("").join("\\*?");
|
||||||
|
result = result.replace(new RegExp(pattern, "g"), name);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
@@ -0,0 +1,369 @@
|
|||||||
|
// Integer arithmetic: primality, factorisation, modular arithmetic, and the
|
||||||
|
// classic sequences. Modular products use BigInt internally — `(a*b) % m`
|
||||||
|
// in floats loses exactness long before the moduli a cryptography-flavoured
|
||||||
|
// question uses.
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Primality
|
||||||
|
|
||||||
|
const SMALL_PRIMES = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deterministic Miller-Rabin. The witness set below is *proven* to decide
|
||||||
|
* primality for every 64-bit integer, so this is exact rather than
|
||||||
|
* probabilistic.
|
||||||
|
*/
|
||||||
|
export function isPrime(value: number): boolean {
|
||||||
|
if (!Number.isSafeInteger(value) || value < 2) return false;
|
||||||
|
for (const small of SMALL_PRIMES) {
|
||||||
|
if (value === small) return true;
|
||||||
|
if (value % small === 0) return false;
|
||||||
|
}
|
||||||
|
let d = BigInt(value - 1);
|
||||||
|
let r = 0;
|
||||||
|
while (d % 2n === 0n) {
|
||||||
|
d /= 2n;
|
||||||
|
r += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const n = BigInt(value);
|
||||||
|
for (const witness of SMALL_PRIMES) {
|
||||||
|
let x = modularPowerBig(BigInt(witness), d, n);
|
||||||
|
if (x === 1n || x === n - 1n) continue;
|
||||||
|
let composite = true;
|
||||||
|
for (let step = 0; step < r - 1; step++) {
|
||||||
|
x = (x * x) % n;
|
||||||
|
if (x === n - 1n) {
|
||||||
|
composite = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (composite) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The next prime at or above `value`, or null when the search is unreasonable. */
|
||||||
|
export function nextPrime(after: number): number | null {
|
||||||
|
let candidate = Math.max(2, after + 1);
|
||||||
|
// Bounded: a caller asking near the integer ceiling should get null, not a hang.
|
||||||
|
while (Number.isSafeInteger(candidate) && candidate - after < 1_000_000) {
|
||||||
|
if (isPrime(candidate)) return candidate;
|
||||||
|
candidate += 1;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function primesUpTo(limit: number): number[] {
|
||||||
|
if (limit < 2) return [];
|
||||||
|
const sieve = new Uint8Array(limit + 1).fill(1);
|
||||||
|
sieve[0] = 0;
|
||||||
|
sieve[1] = 0;
|
||||||
|
for (let candidate = 2; candidate * candidate <= limit; candidate++) {
|
||||||
|
if (!sieve[candidate]) continue;
|
||||||
|
for (let multiple = candidate * candidate; multiple <= limit; multiple += candidate) {
|
||||||
|
sieve[multiple] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const result: number[] = [];
|
||||||
|
for (let value = 2; value <= limit; value++) {
|
||||||
|
if (sieve[value]) result.push(value);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Factorisation
|
||||||
|
|
||||||
|
export type PrimeFactor = { prime: number; exponent: number };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trial division by small primes, then Pollard's rho for the rest.
|
||||||
|
*
|
||||||
|
* Trial division alone is fine to ~10⁷ and hopeless beyond; rho handles
|
||||||
|
* semiprimes with large factors, which is exactly the shape that makes a
|
||||||
|
* naive factoriser appear to hang.
|
||||||
|
*/
|
||||||
|
export function factorize(value: number): PrimeFactor[] {
|
||||||
|
if (value === 0 || !Number.isSafeInteger(value)) return [];
|
||||||
|
let remaining = Math.abs(value);
|
||||||
|
const counts = new Map<number, number>();
|
||||||
|
|
||||||
|
for (const prime of primesUpTo(100_000)) {
|
||||||
|
if (prime * prime > remaining) break;
|
||||||
|
while (remaining % prime === 0) {
|
||||||
|
counts.set(prime, (counts.get(prime) ?? 0) + 1);
|
||||||
|
remaining /= prime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (remaining > 1) {
|
||||||
|
for (const factor of pollardFactorize(remaining)) {
|
||||||
|
counts.set(factor, (counts.get(factor) ?? 0) + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return [...counts.keys()].sort((a, b) => a - b).map((prime) => ({ prime, exponent: counts.get(prime)! }));
|
||||||
|
}
|
||||||
|
|
||||||
|
function pollardFactorize(value: number): number[] {
|
||||||
|
if (value === 1) return [];
|
||||||
|
if (isPrime(value)) return [value];
|
||||||
|
const divisor = pollardRho(value);
|
||||||
|
if (divisor === null) return [value];
|
||||||
|
return [...pollardFactorize(divisor), ...pollardFactorize(value / divisor)];
|
||||||
|
}
|
||||||
|
|
||||||
|
function pollardRho(n: number): number | null {
|
||||||
|
if (n % 2 === 0) return 2;
|
||||||
|
const big = BigInt(n);
|
||||||
|
// Deterministic sequence of offsets rather than a random one: the same
|
||||||
|
// input must factor the same way every run, or a test is a coin flip.
|
||||||
|
for (let offset = 1n; offset <= 40n; offset++) {
|
||||||
|
let x = 2n;
|
||||||
|
let y = 2n;
|
||||||
|
let divisor = 1n;
|
||||||
|
while (divisor === 1n) {
|
||||||
|
x = (x * x + offset) % big;
|
||||||
|
y = (y * y + offset) % big;
|
||||||
|
y = (y * y + offset) % big;
|
||||||
|
divisor = gcdBig(absBig(x - y), big);
|
||||||
|
}
|
||||||
|
if (divisor !== big) return Number(divisor);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function absBig(value: bigint): bigint {
|
||||||
|
return value < 0n ? -value : value;
|
||||||
|
}
|
||||||
|
|
||||||
|
function gcdBig(a: bigint, b: bigint): bigint {
|
||||||
|
let x = a;
|
||||||
|
let y = b;
|
||||||
|
while (y !== 0n) {
|
||||||
|
const next = x % y;
|
||||||
|
x = y;
|
||||||
|
y = next;
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function divisorsOf(value: number): number[] {
|
||||||
|
const magnitude = Math.abs(value);
|
||||||
|
if (magnitude <= 0) return [];
|
||||||
|
let result: number[] = [1];
|
||||||
|
for (const factor of factorize(magnitude)) {
|
||||||
|
const expanded: number[] = [];
|
||||||
|
let power = 1;
|
||||||
|
for (let step = 0; step <= factor.exponent; step++) {
|
||||||
|
expanded.push(...result.map((existing) => existing * power));
|
||||||
|
power *= factor.prime;
|
||||||
|
}
|
||||||
|
result = expanded;
|
||||||
|
}
|
||||||
|
return result.sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* σ(n) and τ(n) come free from the factorisation and are what "perfect
|
||||||
|
* number" and "abundant" questions actually need.
|
||||||
|
*/
|
||||||
|
export function divisorSum(value: number): number {
|
||||||
|
return factorize(Math.abs(value)).reduce((total, factor) => {
|
||||||
|
let term = 1;
|
||||||
|
let power = 1;
|
||||||
|
for (let step = 0; step < factor.exponent; step++) {
|
||||||
|
power *= factor.prime;
|
||||||
|
term += power;
|
||||||
|
}
|
||||||
|
return total * term;
|
||||||
|
}, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function divisorCount(value: number): number {
|
||||||
|
return factorize(Math.abs(value)).reduce((total, factor) => total * (factor.exponent + 1), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Euler's totient. */
|
||||||
|
export function totient(value: number): number {
|
||||||
|
if (value <= 0) return 0;
|
||||||
|
let result = value;
|
||||||
|
for (const factor of factorize(value)) {
|
||||||
|
result = (result / factor.prime) * (factor.prime - 1);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// GCD / LCM
|
||||||
|
|
||||||
|
export function greatestCommonDivisor(a: number, b: number): number {
|
||||||
|
let x = Math.abs(a);
|
||||||
|
let y = Math.abs(b);
|
||||||
|
while (y !== 0) {
|
||||||
|
const next = x % y;
|
||||||
|
x = y;
|
||||||
|
y = next;
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function leastCommonMultiple(a: number, b: number): number {
|
||||||
|
if (a === 0 || b === 0) return 0;
|
||||||
|
return Math.abs((a / greatestCommonDivisor(a, b)) * b);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Extended Euclid: returns `[gcd, x, y]` with `ax + by = gcd`. */
|
||||||
|
export function extendedGCD(a: number, b: number): [number, number, number] {
|
||||||
|
if (b === 0) return [Math.abs(a), a < 0 ? -1 : 1, 0];
|
||||||
|
const [gcd, x, y] = extendedGCD(b, a % b);
|
||||||
|
return [gcd, y, x - Math.floor(a / b) * y];
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Modular arithmetic
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Always non-negative, unlike `%`. JavaScript's `%` on a negative left
|
||||||
|
* operand returns a negative remainder, which is wrong for every modular use
|
||||||
|
* here.
|
||||||
|
*/
|
||||||
|
export function mod(value: number, modulus: number): number {
|
||||||
|
if (modulus === 0) return 0;
|
||||||
|
const remainder = value % modulus;
|
||||||
|
return remainder < 0 ? remainder + Math.abs(modulus) : remainder;
|
||||||
|
}
|
||||||
|
|
||||||
|
function modularPowerBig(base: bigint, exponent: bigint, modulus: bigint): bigint {
|
||||||
|
let result = 1n;
|
||||||
|
let b = base % modulus;
|
||||||
|
if (b < 0n) b += modulus;
|
||||||
|
let e = exponent;
|
||||||
|
while (e > 0n) {
|
||||||
|
if (e & 1n) result = (result * b) % modulus;
|
||||||
|
b = (b * b) % modulus;
|
||||||
|
e >>= 1n;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function modularPower(base: number, exponent: number, modulus: number): number {
|
||||||
|
if (modulus <= 1) return 0;
|
||||||
|
if (exponent < 0) {
|
||||||
|
const inverse = modularInverse(base, modulus);
|
||||||
|
if (inverse === null) return 0;
|
||||||
|
return modularPower(inverse, -exponent, modulus);
|
||||||
|
}
|
||||||
|
return Number(modularPowerBig(BigInt(base), BigInt(exponent), BigInt(modulus)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* null when `value` and `modulus` are not coprime — an inverse genuinely
|
||||||
|
* does not exist, and returning 0 would look like an answer.
|
||||||
|
*/
|
||||||
|
export function modularInverse(value: number, modulus: number): number | null {
|
||||||
|
if (modulus <= 1) return null;
|
||||||
|
const [gcd, x] = extendedGCD(mod(value, modulus), modulus);
|
||||||
|
if (gcd !== 1) return null;
|
||||||
|
return mod(x, modulus);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Sequences
|
||||||
|
|
||||||
|
/** null past fib(78) — the largest that stays an exact double. */
|
||||||
|
export function fibonacci(n: number): number | null {
|
||||||
|
if (n < 0) return null;
|
||||||
|
if (n === 0) return 0;
|
||||||
|
let a = 0;
|
||||||
|
let b = 1; // fib(0), fib(1)
|
||||||
|
// Stop one short and return `b`, so a representable answer is never
|
||||||
|
// reported as overflow by computing fib(n+1) as a side effect.
|
||||||
|
for (let step = 1; step < n; step++) {
|
||||||
|
const next = a + b;
|
||||||
|
if (!Number.isSafeInteger(next)) return null;
|
||||||
|
a = b;
|
||||||
|
b = next;
|
||||||
|
}
|
||||||
|
return b;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function binomial(n: number, k: number): number | null {
|
||||||
|
if (n < 0 || k < 0 || k > n) return null;
|
||||||
|
const kk = Math.min(k, n - k);
|
||||||
|
let result = 1;
|
||||||
|
for (let step = 0; step < kk; step++) {
|
||||||
|
// Multiply then divide keeps every intermediate an integer, and the
|
||||||
|
// division is always exact at this point.
|
||||||
|
const product = result * (n - step);
|
||||||
|
if (!Number.isSafeInteger(product)) return null;
|
||||||
|
result = product / (step + 1);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Digit sum, digital root, and palindrome are the recreational-maths staples
|
||||||
|
* a spoken question actually reaches for.
|
||||||
|
*/
|
||||||
|
export function digitSum(value: number): number {
|
||||||
|
let remaining = Math.abs(value);
|
||||||
|
let total = 0;
|
||||||
|
while (remaining > 0) {
|
||||||
|
total += remaining % 10;
|
||||||
|
remaining = Math.floor(remaining / 10);
|
||||||
|
}
|
||||||
|
return total;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function digitalRoot(value: number): number {
|
||||||
|
const magnitude = Math.abs(value);
|
||||||
|
return magnitude === 0 ? 0 : 1 + ((magnitude - 1) % 9);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isPalindrome(value: number): boolean {
|
||||||
|
const text = String(Math.abs(value));
|
||||||
|
return text === [...text].reverse().join("");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isPerfect(value: number): boolean {
|
||||||
|
return value > 1 && divisorSum(value) - value === value;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Reporting
|
||||||
|
|
||||||
|
/** A full dossier on one integer, which is what "tell me about 5,040" means. */
|
||||||
|
export type IntegerReport = {
|
||||||
|
value: number;
|
||||||
|
isPrime: boolean;
|
||||||
|
factorization: PrimeFactor[];
|
||||||
|
divisorCount: number;
|
||||||
|
divisorSum: number;
|
||||||
|
totient: number;
|
||||||
|
digitSum: number;
|
||||||
|
digitalRoot: number;
|
||||||
|
isPerfect: boolean;
|
||||||
|
isPalindrome: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function factorizationText(report: IntegerReport): string {
|
||||||
|
if (report.factorization.length === 0) return String(report.value);
|
||||||
|
return report.factorization
|
||||||
|
.map((factor) => (factor.exponent === 1 ? `${factor.prime}` : `${factor.prime}^${factor.exponent}`))
|
||||||
|
.join(" × ");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function integerReport(value: number): IntegerReport {
|
||||||
|
return {
|
||||||
|
value,
|
||||||
|
isPrime: isPrime(value),
|
||||||
|
factorization: factorize(value),
|
||||||
|
divisorCount: divisorCount(value),
|
||||||
|
divisorSum: divisorSum(value),
|
||||||
|
totient: totient(Math.abs(value)),
|
||||||
|
digitSum: digitSum(value),
|
||||||
|
digitalRoot: digitalRoot(value),
|
||||||
|
isPerfect: isPerfect(value),
|
||||||
|
isPalindrome: isPalindrome(value),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,320 @@
|
|||||||
|
// Recursive-descent parser over the token stream.
|
||||||
|
//
|
||||||
|
// Grammar, loosest to tightest:
|
||||||
|
//
|
||||||
|
// relation := sum (relop sum)?
|
||||||
|
// sum := product (('+' | '-') product)*
|
||||||
|
// product := unary (('*' | '/' | '%') unary)*
|
||||||
|
// unary := ('-' | '+') unary | power
|
||||||
|
// power := postfix ('^' unary)? -- right associative
|
||||||
|
// postfix := primary '!'*
|
||||||
|
// primary := number | constant | variable | call | '(' relation ')' | '|' sum '|'
|
||||||
|
//
|
||||||
|
// `^` binds tighter than unary minus on its left, so `-x^2` is `-(x^2)` — the
|
||||||
|
// convention every textbook and every other calculator uses. Getting that
|
||||||
|
// backwards silently changes the answer, so it has a test.
|
||||||
|
|
||||||
|
import { type MathToken, MathParseError, tokenize } from "./lexer";
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
type MathFunction,
|
||||||
|
type MathConstant,
|
||||||
|
ALL_CONSTANTS,
|
||||||
|
ALL_FUNCTIONS,
|
||||||
|
addExpr,
|
||||||
|
constant,
|
||||||
|
divideExpr,
|
||||||
|
fn,
|
||||||
|
int,
|
||||||
|
multiplyExpr,
|
||||||
|
negate,
|
||||||
|
num,
|
||||||
|
powerExpr,
|
||||||
|
relation,
|
||||||
|
subtractExpr,
|
||||||
|
variable,
|
||||||
|
} from "./expression";
|
||||||
|
import { describeNumber } from "./math-number";
|
||||||
|
import { normalizeSpoken } from "./normalizer";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Guards against a pathological input recursing until the stack dies. A crash
|
||||||
|
* on the wearer's face is the worst possible failure mode.
|
||||||
|
*/
|
||||||
|
const MAXIMUM_DEPTH = 64;
|
||||||
|
|
||||||
|
export function parse(input: string): MathExpression {
|
||||||
|
const parser = new Parser(tokenize(input), input);
|
||||||
|
const expression = parser.parseRelation();
|
||||||
|
parser.expectEnd();
|
||||||
|
return expression;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Parse text that came from speech: normalise first, then parse. */
|
||||||
|
export function parseSpoken(spoken: string): MathExpression {
|
||||||
|
const normalized = normalizeSpoken(spoken);
|
||||||
|
if (!normalized) throw new MathParseError({ kind: "emptyInput" }, spoken);
|
||||||
|
try {
|
||||||
|
return parse(normalized);
|
||||||
|
} catch (error) {
|
||||||
|
// Report against what the user SAID, not against the normalised form they
|
||||||
|
// never typed — otherwise the error quotes machine output.
|
||||||
|
if (error instanceof MathParseError) {
|
||||||
|
throw new MathParseError(error.errorKind, spoken);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Parser {
|
||||||
|
private index = 0;
|
||||||
|
private depth = 0;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly tokens: MathToken[],
|
||||||
|
private readonly source: string,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Grammar
|
||||||
|
|
||||||
|
parseRelation(): MathExpression {
|
||||||
|
const lhs = this.parseSum();
|
||||||
|
const token = this.peek();
|
||||||
|
if (!token || token.type !== "relation") return lhs;
|
||||||
|
this.advance();
|
||||||
|
const rhs = this.parseSum();
|
||||||
|
// A chained relation ("1 < x < 5") is a real thing people say, but it is
|
||||||
|
// not a single relation node; rejecting it beats silently keeping only
|
||||||
|
// half of the constraint.
|
||||||
|
if (this.peek()?.type === "relation") {
|
||||||
|
throw new MathParseError({ kind: "unexpectedToken", token: "chained comparison" }, this.source);
|
||||||
|
}
|
||||||
|
return relation(token.relation, lhs, rhs);
|
||||||
|
}
|
||||||
|
|
||||||
|
private parseSum(): MathExpression {
|
||||||
|
const terms = [this.parseProduct()];
|
||||||
|
for (;;) {
|
||||||
|
const token = this.peek();
|
||||||
|
if (token?.type === "plus") {
|
||||||
|
this.advance();
|
||||||
|
terms.push(this.parseProduct());
|
||||||
|
} else if (token?.type === "minus") {
|
||||||
|
this.advance();
|
||||||
|
terms.push(negate(this.parseProduct()));
|
||||||
|
} else {
|
||||||
|
return terms.length === 1 ? terms[0]! : addExpr(terms);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private parseProduct(): MathExpression {
|
||||||
|
let factors = [this.parseUnary()];
|
||||||
|
for (;;) {
|
||||||
|
const token = this.peek();
|
||||||
|
if (token?.type === "star") {
|
||||||
|
this.advance();
|
||||||
|
factors.push(this.parseUnary());
|
||||||
|
} else if (token?.type === "slash") {
|
||||||
|
this.advance();
|
||||||
|
factors.push(powerExpr(this.parseUnary(), int(-1)));
|
||||||
|
} else if (token?.type === "percent") {
|
||||||
|
this.advance();
|
||||||
|
const divisor = this.parseUnary();
|
||||||
|
const dividend = factors.length === 1 ? factors[0]! : multiplyExpr(factors);
|
||||||
|
// a mod b == a - b * floor(a / b). Expressed in terms the rest of the
|
||||||
|
// engine already handles, so modulo needs no special case in the
|
||||||
|
// evaluator, simplifier, or differentiator.
|
||||||
|
const quotient = fn("floor", [divideExpr(dividend, divisor)]);
|
||||||
|
factors = [subtractExpr(dividend, multiplyExpr([divisor, quotient]))];
|
||||||
|
} else {
|
||||||
|
return factors.length === 1 ? factors[0]! : multiplyExpr(factors);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private parseUnary(): MathExpression {
|
||||||
|
const token = this.peek();
|
||||||
|
if (token?.type === "minus") {
|
||||||
|
this.advance();
|
||||||
|
return negate(this.parseUnary());
|
||||||
|
}
|
||||||
|
if (token?.type === "plus") {
|
||||||
|
this.advance();
|
||||||
|
return this.parseUnary();
|
||||||
|
}
|
||||||
|
return this.parsePower();
|
||||||
|
}
|
||||||
|
|
||||||
|
private parsePower(): MathExpression {
|
||||||
|
const base = this.parsePostfix();
|
||||||
|
if (this.peek()?.type !== "caret") return base;
|
||||||
|
this.advance();
|
||||||
|
// Right-associative AND allows a unary exponent: 2^-1, 2^3^2 = 2^(3^2).
|
||||||
|
const exponent = this.parseUnary();
|
||||||
|
return powerExpr(base, exponent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private parsePostfix(): MathExpression {
|
||||||
|
let expression = this.parsePrimary();
|
||||||
|
while (this.peek()?.type === "bang") {
|
||||||
|
this.advance();
|
||||||
|
expression = fn("factorial", [expression]);
|
||||||
|
}
|
||||||
|
return expression;
|
||||||
|
}
|
||||||
|
|
||||||
|
private parsePrimary(): MathExpression {
|
||||||
|
this.depth += 1;
|
||||||
|
try {
|
||||||
|
if (this.depth >= MAXIMUM_DEPTH) {
|
||||||
|
throw new MathParseError({ kind: "tooComplex" }, this.source);
|
||||||
|
}
|
||||||
|
const token = this.peek();
|
||||||
|
if (!token) throw new MathParseError({ kind: "unexpectedEnd" }, this.source);
|
||||||
|
|
||||||
|
switch (token.type) {
|
||||||
|
case "number":
|
||||||
|
this.advance();
|
||||||
|
return num(token.value);
|
||||||
|
|
||||||
|
case "identifier":
|
||||||
|
this.advance();
|
||||||
|
return this.parseIdentifier(token.name);
|
||||||
|
|
||||||
|
case "leftParen": {
|
||||||
|
this.advance();
|
||||||
|
const inner = this.parseRelation();
|
||||||
|
this.expect("rightParen");
|
||||||
|
return inner;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "pipe": {
|
||||||
|
// |x| — absolute value. The closing pipe is unambiguous because a
|
||||||
|
// bare `|` is not an operator anywhere else in the grammar.
|
||||||
|
this.advance();
|
||||||
|
const inner = this.parseSum();
|
||||||
|
this.expect("pipe");
|
||||||
|
return fn("abs", [inner]);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "minus":
|
||||||
|
case "plus":
|
||||||
|
return this.parseUnary();
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new MathParseError({ kind: "unexpectedToken", token: describeToken(token) }, this.source);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
this.depth -= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private parseIdentifier(name: string): MathExpression {
|
||||||
|
const lowered = name.toLowerCase();
|
||||||
|
|
||||||
|
if ((ALL_CONSTANTS as readonly string[]).includes(lowered)) {
|
||||||
|
return constant(lowered as MathConstant);
|
||||||
|
}
|
||||||
|
// `log` with no base means base 10 in ordinary speech, not natural log.
|
||||||
|
const resolved = lowered === "log" ? "log10" : lowered;
|
||||||
|
if ((ALL_FUNCTIONS as readonly string[]).includes(resolved)) {
|
||||||
|
const functionName = resolved as MathFunction;
|
||||||
|
// Both `sin(x)` and the spoken-normalised `sin x` must parse.
|
||||||
|
if (this.peek()?.type === "leftParen") {
|
||||||
|
this.advance();
|
||||||
|
const args = [this.parseSum()];
|
||||||
|
while (this.peek()?.type === "comma") {
|
||||||
|
this.advance();
|
||||||
|
args.push(this.parseSum());
|
||||||
|
}
|
||||||
|
this.expect("rightParen");
|
||||||
|
return fn(functionName, args);
|
||||||
|
}
|
||||||
|
const argument = this.parsePower();
|
||||||
|
return fn(functionName, [argument]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// A run of single letters from the normaliser ("xy") is a product of
|
||||||
|
// variables, not one variable named "xy". Multi-letter names are only
|
||||||
|
// honoured when the caller typed them with an underscore or a digit.
|
||||||
|
if (lowered.length > 1 && !lowered.includes("_") && !/\d/.test(lowered)) {
|
||||||
|
const factors = lowered.split("").map((letter) => variable(letter));
|
||||||
|
return multiplyExpr(factors);
|
||||||
|
}
|
||||||
|
return variable(lowered);
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Token plumbing
|
||||||
|
|
||||||
|
private peek(): MathToken | null {
|
||||||
|
return this.index < this.tokens.length ? this.tokens[this.index]! : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private advance(): void {
|
||||||
|
this.index += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private expect(type: MathToken["type"]): void {
|
||||||
|
const actual = this.peek();
|
||||||
|
if (!actual) {
|
||||||
|
throw new MathParseError(
|
||||||
|
type === "rightParen" ? { kind: "unbalancedParenthesis" } : { kind: "unexpectedEnd" },
|
||||||
|
this.source,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (actual.type !== type) {
|
||||||
|
throw new MathParseError(
|
||||||
|
type === "rightParen"
|
||||||
|
? { kind: "unbalancedParenthesis" }
|
||||||
|
: { kind: "unexpectedToken", token: describeToken(actual) },
|
||||||
|
this.source,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
this.advance();
|
||||||
|
}
|
||||||
|
|
||||||
|
expectEnd(): void {
|
||||||
|
if (this.index < this.tokens.length) {
|
||||||
|
throw new MathParseError(
|
||||||
|
{ kind: "unexpectedToken", token: describeToken(this.tokens[this.index]!) },
|
||||||
|
this.source,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function describeToken(token: MathToken): string {
|
||||||
|
switch (token.type) {
|
||||||
|
case "number":
|
||||||
|
return describeNumber(token.value);
|
||||||
|
case "identifier":
|
||||||
|
return token.name;
|
||||||
|
case "plus":
|
||||||
|
return "+";
|
||||||
|
case "minus":
|
||||||
|
return "-";
|
||||||
|
case "star":
|
||||||
|
return "*";
|
||||||
|
case "slash":
|
||||||
|
return "/";
|
||||||
|
case "percent":
|
||||||
|
return "%";
|
||||||
|
case "caret":
|
||||||
|
return "^";
|
||||||
|
case "bang":
|
||||||
|
return "!";
|
||||||
|
case "leftParen":
|
||||||
|
return "(";
|
||||||
|
case "rightParen":
|
||||||
|
return ")";
|
||||||
|
case "pipe":
|
||||||
|
return "|";
|
||||||
|
case "comma":
|
||||||
|
return ",";
|
||||||
|
case "relation":
|
||||||
|
return token.relation;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,305 @@
|
|||||||
|
// Samples an expression into drawable graph data: segments, viewport,
|
||||||
|
// roots, and extrema.
|
||||||
|
|
||||||
|
import { type MathExpression, subtractExpr, variablesOf } from "./expression";
|
||||||
|
import { evaluateValue } from "./evaluator";
|
||||||
|
import { simplify } from "./simplifier";
|
||||||
|
import { Polynomial } from "./polynomial";
|
||||||
|
import { numericRoots } from "./solver";
|
||||||
|
import { fromDecimal, describeNumber } from "./math-number";
|
||||||
|
import { plain } from "./text-renderer";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Plot model
|
||||||
|
|
||||||
|
export type GraphViewport = {
|
||||||
|
xMin: number;
|
||||||
|
xMax: number;
|
||||||
|
yMin: number;
|
||||||
|
yMax: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const STANDARD_VIEWPORT: GraphViewport = { xMin: -10, xMax: 10, yMin: -10, yMax: 10 };
|
||||||
|
|
||||||
|
export function viewportContainsY(viewport: GraphViewport, y: number): boolean {
|
||||||
|
return y >= viewport.yMin && y <= viewport.yMax;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type GraphPoint = { x: number; y: number };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One continuous run of the curve. A function with a pole produces several,
|
||||||
|
* so the renderer can lift the pen instead of drawing a vertical line through
|
||||||
|
* the asymptote — which is the single most recognisable "bad graphing app"
|
||||||
|
* artefact.
|
||||||
|
*/
|
||||||
|
export type GraphSegment = { points: GraphPoint[] };
|
||||||
|
|
||||||
|
export type GraphMarkerKind = "root" | "yIntercept" | "extremum" | "intersection";
|
||||||
|
|
||||||
|
export type GraphMarker = {
|
||||||
|
kind: GraphMarkerKind;
|
||||||
|
point: GraphPoint;
|
||||||
|
label: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type GraphPlot = {
|
||||||
|
expression: MathExpression;
|
||||||
|
variable: string;
|
||||||
|
segments: GraphSegment[];
|
||||||
|
markers: GraphMarker[];
|
||||||
|
label: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type GraphAxis = { ticks: number[]; step: number };
|
||||||
|
|
||||||
|
export type Graph = {
|
||||||
|
plots: GraphPlot[];
|
||||||
|
viewport: GraphViewport;
|
||||||
|
xAxis: GraphAxis;
|
||||||
|
yAxis: GraphAxis;
|
||||||
|
};
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Plotter
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sample count. Matched to the glasses viewport width times a small factor:
|
||||||
|
* enough that a curve looks smooth after projection, few enough that plotting
|
||||||
|
* stays imperceptible on a phone.
|
||||||
|
*/
|
||||||
|
export const DEFAULT_SAMPLE_COUNT = 1_200;
|
||||||
|
|
||||||
|
/** Values beyond this are treated as a pole rather than a steep slope. */
|
||||||
|
const POLE_THRESHOLD = 1e7;
|
||||||
|
|
||||||
|
export function plot(
|
||||||
|
expressions: MathExpression[],
|
||||||
|
options: {
|
||||||
|
variable?: string;
|
||||||
|
viewport?: GraphViewport;
|
||||||
|
usesDegrees?: boolean;
|
||||||
|
sampleCount?: number;
|
||||||
|
} = {},
|
||||||
|
): Graph {
|
||||||
|
const usesDegrees = options.usesDegrees ?? false;
|
||||||
|
const sampleCount = options.sampleCount ?? DEFAULT_SAMPLE_COUNT;
|
||||||
|
const variable =
|
||||||
|
options.variable ??
|
||||||
|
expressions.map((expression) => variablesOf(expression)[0]).find((name) => name !== undefined) ??
|
||||||
|
"x";
|
||||||
|
|
||||||
|
// Autoscale y from the data when the caller did not pin a viewport, but
|
||||||
|
// keep x at the requested (or standard) window — rescaling both makes a
|
||||||
|
// graph that never matches what the user asked to see.
|
||||||
|
const xWindow = options.viewport ?? STANDARD_VIEWPORT;
|
||||||
|
const plots: GraphPlot[] = [];
|
||||||
|
const allY: number[] = [];
|
||||||
|
|
||||||
|
for (const expression of expressions) {
|
||||||
|
const body = functionBody(expression);
|
||||||
|
const sampled = sample(body, variable, xWindow.xMin, xWindow.xMax, sampleCount, usesDegrees);
|
||||||
|
for (const segment of sampled) {
|
||||||
|
for (const point of segment.points) allY.push(point.y);
|
||||||
|
}
|
||||||
|
plots.push({
|
||||||
|
expression: body,
|
||||||
|
variable,
|
||||||
|
segments: sampled,
|
||||||
|
markers: markers(body, variable, xWindow.xMin, xWindow.xMax),
|
||||||
|
label: plain(body),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const viewport = options.viewport ?? autoscale(xWindow, allY);
|
||||||
|
const clipped = plots.map((entry) => ({
|
||||||
|
expression: entry.expression,
|
||||||
|
variable: entry.variable,
|
||||||
|
segments: clip(entry.segments, viewport),
|
||||||
|
markers: entry.markers.filter((marker) => viewportContainsY(viewport, marker.point.y)),
|
||||||
|
label: entry.label,
|
||||||
|
}));
|
||||||
|
|
||||||
|
return {
|
||||||
|
plots: clipped,
|
||||||
|
viewport,
|
||||||
|
xAxis: axis(viewport.xMin, viewport.xMax),
|
||||||
|
yAxis: axis(viewport.yMin, viewport.yMax),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `y = x^2 + 1` and `x^2 + 1` should plot the same curve, and `x^2 + y = 1`
|
||||||
|
* should plot `y = 1 - x^2` where that is easy to see.
|
||||||
|
*/
|
||||||
|
export function functionBody(expression: MathExpression): MathExpression {
|
||||||
|
if (expression.type !== "relation") return expression;
|
||||||
|
if (expression.lhs.type === "variable" && expression.lhs.name === "y") return expression.rhs;
|
||||||
|
if (expression.rhs.type === "variable" && expression.rhs.name === "y") return expression.lhs;
|
||||||
|
// Otherwise plot the difference, whose zero set is the relation — the
|
||||||
|
// honest generalisation, and it makes an implicit curve's roots visible on
|
||||||
|
// the x-axis.
|
||||||
|
return simplify(subtractExpr(expression.lhs, expression.rhs));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Sampling
|
||||||
|
|
||||||
|
export function sample(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
xMin: number,
|
||||||
|
xMax: number,
|
||||||
|
count: number,
|
||||||
|
usesDegrees: boolean,
|
||||||
|
): GraphSegment[] {
|
||||||
|
if (count <= 1 || xMax <= xMin) return [];
|
||||||
|
const segments: GraphSegment[] = [];
|
||||||
|
let current: GraphPoint[] = [];
|
||||||
|
const step = (xMax - xMin) / (count - 1);
|
||||||
|
let previousY: number | null = null;
|
||||||
|
|
||||||
|
for (let index = 0; index < count; index++) {
|
||||||
|
const x = xMin + index * step;
|
||||||
|
const y = evaluateValue(expression, { [variable]: x }, usesDegrees);
|
||||||
|
if (y === null || !Number.isFinite(y) || Math.abs(y) >= POLE_THRESHOLD) {
|
||||||
|
// Undefined or blown up: close the run.
|
||||||
|
if (current.length > 1) segments.push({ points: current });
|
||||||
|
current = [];
|
||||||
|
previousY = null;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A jump this large between adjacent samples is a pole, not a slope.
|
||||||
|
// tan(x) is the canonical case: without this the curve gets a vertical
|
||||||
|
// line at every asymptote.
|
||||||
|
if (previousY !== null && Math.abs(y - previousY) > (xMax - xMin) * 50) {
|
||||||
|
if (current.length > 1) segments.push({ points: current });
|
||||||
|
current = [];
|
||||||
|
}
|
||||||
|
current.push({ x, y });
|
||||||
|
previousY = y;
|
||||||
|
}
|
||||||
|
if (current.length > 1) segments.push({ points: current });
|
||||||
|
return segments;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Autoscale
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Percentile-based rather than min/max: one spike near a pole would
|
||||||
|
* otherwise compress the interesting part of the curve into a flat line.
|
||||||
|
*/
|
||||||
|
export function autoscale(xWindow: GraphViewport, yValues: number[]): GraphViewport {
|
||||||
|
const finite = yValues.filter((y) => Number.isFinite(y) && Math.abs(y) < POLE_THRESHOLD).sort((a, b) => a - b);
|
||||||
|
if (finite.length <= 2) {
|
||||||
|
return { xMin: xWindow.xMin, xMax: xWindow.xMax, yMin: -10, yMax: 10 };
|
||||||
|
}
|
||||||
|
const lowIndex = Math.floor(finite.length * 0.02);
|
||||||
|
const highIndex = Math.floor(finite.length * 0.98);
|
||||||
|
let low = finite[Math.min(lowIndex, finite.length - 1)]!;
|
||||||
|
let high = finite[Math.min(highIndex, finite.length - 1)]!;
|
||||||
|
|
||||||
|
// Always show the x-axis when the curve comes near it — a graph that omits
|
||||||
|
// y = 0 reads as if the function never crosses.
|
||||||
|
if (low > 0 && low < high * 0.5) low = 0;
|
||||||
|
if (high < 0 && high > low * 0.5) high = 0;
|
||||||
|
|
||||||
|
if (high - low < 1e-9) {
|
||||||
|
const centre = (high + low) / 2;
|
||||||
|
low = centre - 1;
|
||||||
|
high = centre + 1;
|
||||||
|
}
|
||||||
|
const padding = (high - low) * 0.1;
|
||||||
|
return {
|
||||||
|
xMin: xWindow.xMin,
|
||||||
|
xMax: xWindow.xMax,
|
||||||
|
yMin: low - padding,
|
||||||
|
yMax: high + padding,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clip(segments: GraphSegment[], viewport: GraphViewport): GraphSegment[] {
|
||||||
|
const result: GraphSegment[] = [];
|
||||||
|
for (const segment of segments) {
|
||||||
|
let current: GraphPoint[] = [];
|
||||||
|
for (const point of segment.points) {
|
||||||
|
if (viewportContainsY(viewport, point.y)) {
|
||||||
|
current.push(point);
|
||||||
|
} else if (current.length > 0) {
|
||||||
|
// Keep one out-of-range point so the line exits the frame rather than
|
||||||
|
// stopping short of the edge.
|
||||||
|
current.push(point);
|
||||||
|
result.push({ points: current });
|
||||||
|
current = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (current.length > 1) result.push({ points: current });
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Axes
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "Nice" tick spacing — 1, 2, 5, 10 × 10^n — so labels are round numbers a
|
||||||
|
* person can read at a glance on the lens.
|
||||||
|
*/
|
||||||
|
export function axis(lower: number, upper: number, targetTicks = 10): GraphAxis {
|
||||||
|
const span = upper - lower;
|
||||||
|
if (span <= 0 || !Number.isFinite(span)) return { ticks: [], step: 1 };
|
||||||
|
const rough = span / targetTicks;
|
||||||
|
const magnitude = Math.pow(10, Math.floor(Math.log10(rough)));
|
||||||
|
const normalized = rough / magnitude;
|
||||||
|
let step: number;
|
||||||
|
if (normalized <= 1) step = magnitude;
|
||||||
|
else if (normalized <= 2) step = 2 * magnitude;
|
||||||
|
else if (normalized <= 5) step = 5 * magnitude;
|
||||||
|
else step = 10 * magnitude;
|
||||||
|
|
||||||
|
const ticks: number[] = [];
|
||||||
|
let value = Math.ceil(lower / step) * step;
|
||||||
|
while (value <= upper && ticks.length < 64) {
|
||||||
|
// Snap a near-zero tick to exactly zero so the axis line and its label
|
||||||
|
// agree.
|
||||||
|
ticks.push(Math.abs(value) < step * 1e-9 ? 0 : value);
|
||||||
|
value += step;
|
||||||
|
}
|
||||||
|
return { ticks, step };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Markers
|
||||||
|
|
||||||
|
export function markers(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
xMin: number,
|
||||||
|
xMax: number,
|
||||||
|
): GraphMarker[] {
|
||||||
|
const result: GraphMarker[] = [];
|
||||||
|
|
||||||
|
const yIntercept = evaluateValue(expression, { [variable]: 0 });
|
||||||
|
if (yIntercept !== null && Number.isFinite(yIntercept) && xMin <= 0 && xMax >= 0) {
|
||||||
|
result.push({
|
||||||
|
kind: "yIntercept",
|
||||||
|
point: { x: 0, y: yIntercept },
|
||||||
|
label: `(0, ${describeNumber(fromDecimal(yIntercept))})`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Roots: exact when the curve is a polynomial, sampled otherwise.
|
||||||
|
const polynomial = Polynomial.extract(expression, variable);
|
||||||
|
if (polynomial) {
|
||||||
|
for (const root of numericRoots(polynomial, [xMin, xMax], 4_000)) {
|
||||||
|
result.push({
|
||||||
|
kind: "root",
|
||||||
|
point: { x: root, y: 0 },
|
||||||
|
label: `(${describeNumber(fromDecimal(root))}, 0)`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result.slice(0, 12);
|
||||||
|
}
|
||||||
@@ -0,0 +1,247 @@
|
|||||||
|
// Dense coefficient vector in one variable, `coefficients[i]` multiplying
|
||||||
|
// `x^i`. Extracting one of these is how the solver decides what technique
|
||||||
|
// applies — degree 1 is a rearrangement, degree 2 is the quadratic formula,
|
||||||
|
// higher degrees go to rational-root plus a numeric fallback.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
addExpr,
|
||||||
|
constantValue,
|
||||||
|
int,
|
||||||
|
multiplyExpr,
|
||||||
|
negate,
|
||||||
|
num,
|
||||||
|
powerExpr,
|
||||||
|
variable as variableExpr,
|
||||||
|
} from "./expression";
|
||||||
|
import {
|
||||||
|
type MathNumber,
|
||||||
|
add,
|
||||||
|
doubleValue,
|
||||||
|
greatestCommonDivisor,
|
||||||
|
integer,
|
||||||
|
integerValue,
|
||||||
|
isOne,
|
||||||
|
isZero,
|
||||||
|
multiply,
|
||||||
|
negated,
|
||||||
|
numberEquals,
|
||||||
|
real,
|
||||||
|
} from "./math-number";
|
||||||
|
|
||||||
|
export class Polynomial {
|
||||||
|
readonly coefficients: MathNumber[];
|
||||||
|
readonly variable: string;
|
||||||
|
|
||||||
|
constructor(coefficients: MathNumber[], variable: string) {
|
||||||
|
this.coefficients = [...coefficients];
|
||||||
|
this.variable = variable;
|
||||||
|
while (this.coefficients.length > 1 && isZero(this.coefficients[this.coefficients.length - 1]!)) {
|
||||||
|
this.coefficients.pop();
|
||||||
|
}
|
||||||
|
if (this.coefficients.length === 0) this.coefficients.push(integer(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
get degree(): number {
|
||||||
|
return this.coefficients.length - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
get isZero(): boolean {
|
||||||
|
return this.coefficients.every(isZero);
|
||||||
|
}
|
||||||
|
|
||||||
|
at(power: number): MathNumber {
|
||||||
|
return power < this.coefficients.length ? this.coefficients[power]! : integer(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build from an expression, or null when it is not a polynomial in
|
||||||
|
* `variable` (a variable inside `sin`, a symbolic exponent, `1/x`).
|
||||||
|
*/
|
||||||
|
static extract(expression: MathExpression, variable: string): Polynomial | null {
|
||||||
|
const coefficients: MathNumber[] = [];
|
||||||
|
if (!accumulate(expression, variable, integer(1), coefficients)) return null;
|
||||||
|
return new Polynomial(coefficients, variable);
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// Evaluation
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Horner's method — fewer operations and less rounding drift than summing
|
||||||
|
* `a_i * x^i` term by term, which matters for the numeric root refinement.
|
||||||
|
*/
|
||||||
|
value(x: number): number {
|
||||||
|
let result = 0;
|
||||||
|
for (let index = this.coefficients.length - 1; index >= 0; index--) {
|
||||||
|
result = result * x + doubleValue(this.coefficients[index]!);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
get derivative(): Polynomial {
|
||||||
|
if (this.degree <= 0) return new Polynomial([integer(0)], this.variable);
|
||||||
|
const derived: MathNumber[] = [];
|
||||||
|
for (let power = 1; power <= this.degree; power++) {
|
||||||
|
derived.push(multiply(this.at(power), integer(power)));
|
||||||
|
}
|
||||||
|
return new Polynomial(derived, this.variable);
|
||||||
|
}
|
||||||
|
|
||||||
|
expression(): MathExpression {
|
||||||
|
const terms: MathExpression[] = [];
|
||||||
|
for (let power = this.degree; power >= 0; power--) {
|
||||||
|
const coefficient = this.at(power);
|
||||||
|
if (isZero(coefficient)) continue;
|
||||||
|
let variablePart: MathExpression | null;
|
||||||
|
if (power === 0) {
|
||||||
|
variablePart = null;
|
||||||
|
} else if (power === 1) {
|
||||||
|
variablePart = variableExpr(this.variable);
|
||||||
|
} else {
|
||||||
|
variablePart = powerExpr(variableExpr(this.variable), int(power));
|
||||||
|
}
|
||||||
|
if (!variablePart) {
|
||||||
|
terms.push(num(coefficient));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (isOne(coefficient)) {
|
||||||
|
terms.push(variablePart);
|
||||||
|
} else if (numberEquals(coefficient, integer(-1))) {
|
||||||
|
terms.push(negate(variablePart));
|
||||||
|
} else {
|
||||||
|
terms.push(multiplyExpr([num(coefficient), variablePart]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (terms.length === 0) return int(0);
|
||||||
|
return terms.length === 1 ? terms[0]! : addExpr(terms);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Divide out a known root, returning the depressed polynomial. Used after a
|
||||||
|
* rational root is found so the remainder can be solved in closed form.
|
||||||
|
*/
|
||||||
|
dividingByRoot(root: MathNumber): Polynomial {
|
||||||
|
if (this.degree < 1) return this;
|
||||||
|
const quotient: MathNumber[] = new Array(this.degree).fill(integer(0));
|
||||||
|
let carry: MathNumber = integer(0);
|
||||||
|
for (let power = this.degree; power >= 1; power--) {
|
||||||
|
const coefficient = add(this.at(power), carry);
|
||||||
|
quotient[power - 1] = coefficient;
|
||||||
|
carry = multiply(coefficient, root);
|
||||||
|
}
|
||||||
|
return new Polynomial(quotient, this.variable);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Integer coefficients after clearing denominators, for the rational root
|
||||||
|
* theorem. Only meaningful when every coefficient is exact.
|
||||||
|
*/
|
||||||
|
get integerCoefficients(): number[] | null {
|
||||||
|
let multiplier = 1;
|
||||||
|
for (const coefficient of this.coefficients) {
|
||||||
|
if (coefficient.kind === "integer") continue;
|
||||||
|
if (coefficient.kind === "real") return null;
|
||||||
|
multiplier = (multiplier / greatestCommonDivisor(multiplier, coefficient.d)) * coefficient.d;
|
||||||
|
if (multiplier >= 1_000_000) return null;
|
||||||
|
}
|
||||||
|
const scaled: number[] = [];
|
||||||
|
for (const coefficient of this.coefficients) {
|
||||||
|
const value = integerValue(multiply(coefficient, integer(multiplier)));
|
||||||
|
if (value === null) return null;
|
||||||
|
scaled.push(value);
|
||||||
|
}
|
||||||
|
return scaled;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function accumulate(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
scale: MathNumber,
|
||||||
|
coefficients: MathNumber[],
|
||||||
|
): boolean {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number":
|
||||||
|
addAt(multiply(scale, expression.value), 0, coefficients);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
case "constant":
|
||||||
|
addAt(multiply(scale, real(constantValue(expression.constant))), 0, coefficients);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
case "variable":
|
||||||
|
if (expression.name === variable) {
|
||||||
|
addAt(scale, 1, coefficients);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// Another free variable makes this not a single-variable polynomial —
|
||||||
|
// refuse rather than silently treating it as a constant, which would
|
||||||
|
// produce a confidently wrong root.
|
||||||
|
return false;
|
||||||
|
|
||||||
|
case "negate":
|
||||||
|
return accumulate(expression.inner, variable, negated(scale), coefficients);
|
||||||
|
|
||||||
|
case "add":
|
||||||
|
for (const term of expression.terms) {
|
||||||
|
if (!accumulate(term, variable, scale, coefficients)) return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
|
||||||
|
case "multiply": {
|
||||||
|
// Multiply out: each factor must itself be a polynomial, and the
|
||||||
|
// product of their coefficient vectors is the result.
|
||||||
|
let product: MathNumber[] = [integer(1)];
|
||||||
|
for (const factor of expression.factors) {
|
||||||
|
const factorCoefficients: MathNumber[] = [];
|
||||||
|
if (!accumulate(factor, variable, integer(1), factorCoefficients)) return false;
|
||||||
|
product = convolve(product, factorCoefficients);
|
||||||
|
if (product.length > 64) return false;
|
||||||
|
}
|
||||||
|
for (let power = 0; power < product.length; power++) {
|
||||||
|
addAt(multiply(scale, product[power]!), power, coefficients);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "power": {
|
||||||
|
const exponentNumber = expression.exponent.type === "number" ? expression.exponent.value : null;
|
||||||
|
const power = exponentNumber ? integerValue(exponentNumber) : null;
|
||||||
|
if (power === null || power < 0 || power > 32) return false;
|
||||||
|
const baseCoefficients: MathNumber[] = [];
|
||||||
|
if (!accumulate(expression.base, variable, integer(1), baseCoefficients)) return false;
|
||||||
|
let product: MathNumber[] = [integer(1)];
|
||||||
|
for (let step = 0; step < power; step++) {
|
||||||
|
product = convolve(product, baseCoefficients);
|
||||||
|
if (product.length > 64) return false;
|
||||||
|
}
|
||||||
|
for (let index = 0; index < product.length; index++) {
|
||||||
|
addAt(multiply(scale, product[index]!), index, coefficients);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "function":
|
||||||
|
case "relation":
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function addAt(value: MathNumber, power: number, coefficients: MathNumber[]): void {
|
||||||
|
while (coefficients.length <= power) coefficients.push(integer(0));
|
||||||
|
coefficients[power] = add(coefficients[power]!, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function convolve(lhs: MathNumber[], rhs: MathNumber[]): MathNumber[] {
|
||||||
|
if (lhs.length === 0 || rhs.length === 0) return [integer(0)];
|
||||||
|
const result: MathNumber[] = new Array(lhs.length + rhs.length - 1).fill(integer(0));
|
||||||
|
for (let i = 0; i < lhs.length; i++) {
|
||||||
|
if (isZero(lhs[i]!)) continue;
|
||||||
|
for (let j = 0; j < rhs.length; j++) {
|
||||||
|
if (isZero(rhs[j]!)) continue;
|
||||||
|
result[i + j] = add(result[i + j]!, multiply(lhs[i]!, rhs[j]!));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
@@ -0,0 +1,509 @@
|
|||||||
|
// The command parser and the stateful session. Stateful on purpose: "graph
|
||||||
|
// it" is only meaningful with respect to the problem already on screen, and
|
||||||
|
// requiring the wearer to restate the equation to see its graph would defeat
|
||||||
|
// the point.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
variablesOf,
|
||||||
|
} from "./expression";
|
||||||
|
import { describeNumber, fromDecimal } from "./math-number";
|
||||||
|
import { type AdvancedTopic, answerAdvanced, parseAdvanced } from "./advanced";
|
||||||
|
import { type EvaluatorContext, radiansContext } from "./evaluator";
|
||||||
|
import { parseSpoken } from "./parser";
|
||||||
|
import { MathParseError } from "./lexer";
|
||||||
|
import {
|
||||||
|
type MathSolution,
|
||||||
|
type SolutionStep,
|
||||||
|
solutionHeadline,
|
||||||
|
solve as solveExpression,
|
||||||
|
} from "./solver";
|
||||||
|
import { type Graph, type GraphViewport, functionBody, plot } from "./plotter";
|
||||||
|
import { differentiate, integrateNumeric } from "./derivative";
|
||||||
|
import { plain } from "./text-renderer";
|
||||||
|
import { type MathWorkload } from "./workload";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Commands
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What the wearer asked for. Parsed from speech so "graph it" and "explain
|
||||||
|
* it" work as follow-ups to a problem already on the glasses, without
|
||||||
|
* restating it.
|
||||||
|
*/
|
||||||
|
export type MathCommand =
|
||||||
|
/** A new problem to solve or evaluate. */
|
||||||
|
| { kind: "problem"; text: string }
|
||||||
|
| { kind: "graph" }
|
||||||
|
| { kind: "explain" }
|
||||||
|
| { kind: "nextStep" }
|
||||||
|
| { kind: "previousStep" }
|
||||||
|
| { kind: "derivative"; variable: string | null }
|
||||||
|
| { kind: "integrate"; variable: string | null; from: number; to: number }
|
||||||
|
| { kind: "restate" }
|
||||||
|
| { kind: "clear" }
|
||||||
|
/**
|
||||||
|
* A named advanced topic — primality, an integral, a limit, a shape's
|
||||||
|
* area. These carry their own arguments rather than acting on a standing
|
||||||
|
* expression, which is why they are a separate case.
|
||||||
|
*/
|
||||||
|
| { kind: "advanced"; topic: AdvancedTopic };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recognise a follow-up. Returns null when the utterance is not a math
|
||||||
|
* command at all, so the caller can leave unrelated speech alone.
|
||||||
|
*/
|
||||||
|
export function parseCommand(utterance: string): MathCommand | null {
|
||||||
|
const text = utterance.toLowerCase().replace(/^[ .,!?]+|[ .,!?]+$/g, "");
|
||||||
|
|
||||||
|
// Follow-ups first: they are short and would otherwise be parsed as
|
||||||
|
// (nonsense) expressions.
|
||||||
|
//
|
||||||
|
// The bare verb is listed alongside every "it"/"that"/"this" form on
|
||||||
|
// purpose: these are the three commands a wearer is TOLD they can say, and
|
||||||
|
// someone who has been shown "Graph" will say "graph" as often as
|
||||||
|
// "graph it". Leaving the bare form out makes the feature look broken in
|
||||||
|
// exactly the case the user was taught.
|
||||||
|
switch (text) {
|
||||||
|
case "graph":
|
||||||
|
case "graph it":
|
||||||
|
case "graph that":
|
||||||
|
case "graph this":
|
||||||
|
case "plot":
|
||||||
|
case "plot it":
|
||||||
|
case "plot that":
|
||||||
|
case "plot this":
|
||||||
|
case "show the graph":
|
||||||
|
case "draw it":
|
||||||
|
case "show me the graph":
|
||||||
|
return { kind: "graph" };
|
||||||
|
case "explain":
|
||||||
|
case "explain it":
|
||||||
|
case "explain that":
|
||||||
|
case "explain this":
|
||||||
|
case "show the steps":
|
||||||
|
case "show your work":
|
||||||
|
case "how did you get that":
|
||||||
|
case "walk me through it":
|
||||||
|
case "step by step":
|
||||||
|
return { kind: "explain" };
|
||||||
|
// "Solve it" on a problem already on the lens is a request for the answer
|
||||||
|
// again, not a re-parse — `restate` is exactly that, and routing it here
|
||||||
|
// means the standing problem is never silently re-solved with a fresh
|
||||||
|
// (and possibly worse) reading of the same words.
|
||||||
|
case "solve":
|
||||||
|
case "solve it":
|
||||||
|
case "solve that":
|
||||||
|
case "solve this":
|
||||||
|
case "work it out":
|
||||||
|
case "what is the answer":
|
||||||
|
case "what's the answer":
|
||||||
|
case "whats the answer":
|
||||||
|
case "answer it":
|
||||||
|
return { kind: "restate" };
|
||||||
|
case "next":
|
||||||
|
case "next step":
|
||||||
|
case "continue":
|
||||||
|
case "go on":
|
||||||
|
case "and then":
|
||||||
|
return { kind: "nextStep" };
|
||||||
|
case "back":
|
||||||
|
case "previous":
|
||||||
|
case "previous step":
|
||||||
|
case "go back":
|
||||||
|
case "last step":
|
||||||
|
return { kind: "previousStep" };
|
||||||
|
case "say it again":
|
||||||
|
case "repeat that":
|
||||||
|
case "what was it":
|
||||||
|
case "restate":
|
||||||
|
case "again":
|
||||||
|
return { kind: "restate" };
|
||||||
|
case "clear":
|
||||||
|
case "reset":
|
||||||
|
case "start over":
|
||||||
|
case "never mind":
|
||||||
|
case "forget it":
|
||||||
|
return { kind: "clear" };
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
const derivative = matchDerivative(text);
|
||||||
|
if (derivative !== null) return { kind: "derivative", variable: derivative };
|
||||||
|
// Advanced topics BEFORE the plain-integral shortcut and the
|
||||||
|
// looks-like-maths gate: "the integral of x squared from 0 to 3" and "is 91
|
||||||
|
// prime" both contain digits and operator words, and the expression parser
|
||||||
|
// would make nonsense of either.
|
||||||
|
const topic = parseAdvanced(utterance);
|
||||||
|
if (topic) return { kind: "advanced", topic };
|
||||||
|
const integral = matchIntegral(text);
|
||||||
|
if (integral) return integral;
|
||||||
|
|
||||||
|
// Anything with a digit, an operator word, or a relation is a problem.
|
||||||
|
if (!looksLikeMath(text)) return null;
|
||||||
|
return { kind: "problem", text: utterance };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Distinguishes "no derivative request" (null) from "derivative of the default variable". */
|
||||||
|
function matchDerivative(text: string): string | null {
|
||||||
|
const triggers = [
|
||||||
|
"differentiate",
|
||||||
|
"take the derivative",
|
||||||
|
"the derivative",
|
||||||
|
"derivative of",
|
||||||
|
"d by d",
|
||||||
|
"find the derivative",
|
||||||
|
];
|
||||||
|
if (!triggers.some((trigger) => text.includes(trigger))) return null;
|
||||||
|
// "derivative with respect to t"
|
||||||
|
const marker = "with respect to ";
|
||||||
|
const index = text.indexOf(marker);
|
||||||
|
if (index >= 0) {
|
||||||
|
const tail = text.slice(index + marker.length).trim();
|
||||||
|
const first = tail.split(/\s+/)[0];
|
||||||
|
if (first && first.length <= 12) return first;
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function matchIntegral(text: string): MathCommand | null {
|
||||||
|
if (!text.includes("integral") && !text.includes("integrate")) return null;
|
||||||
|
// "integrate from 0 to 5"
|
||||||
|
const match = text.match(/from\s+(-?[0-9.]+)\s+to\s+(-?[0-9.]+)/);
|
||||||
|
if (!match) return null;
|
||||||
|
const lower = Number(match[1]);
|
||||||
|
const upper = Number(match[2]);
|
||||||
|
if (!Number.isFinite(lower) || !Number.isFinite(upper)) return null;
|
||||||
|
return { kind: "integrate", variable: null, from: lower, to: upper };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A cheap gate so ordinary conversation is not parsed as arithmetic. The
|
||||||
|
* continuous-listening path hands this every utterance in the room; without
|
||||||
|
* the gate, "I'll see you at four" becomes a math problem.
|
||||||
|
*/
|
||||||
|
export function looksLikeMath(text: string): boolean {
|
||||||
|
const operatorWords = [
|
||||||
|
"plus",
|
||||||
|
"minus",
|
||||||
|
"times",
|
||||||
|
"divided",
|
||||||
|
"equals",
|
||||||
|
"squared",
|
||||||
|
"cubed",
|
||||||
|
"square root",
|
||||||
|
"solve",
|
||||||
|
"what is",
|
||||||
|
"calculate",
|
||||||
|
"percent",
|
||||||
|
"factorial",
|
||||||
|
"to the power",
|
||||||
|
"log",
|
||||||
|
"sine",
|
||||||
|
"cosine",
|
||||||
|
"tangent",
|
||||||
|
];
|
||||||
|
const hasOperatorWord = operatorWords.some((word) => text.includes(word));
|
||||||
|
const hasSymbol = /[+\-*/^=<>]/.test(text);
|
||||||
|
const hasDigit = /\d/.test(text);
|
||||||
|
// Spelled-out numbers count too. "what is two plus two" has an operator
|
||||||
|
// word and no digit at all, and requiring a digit made the single most
|
||||||
|
// obvious test phrase fall straight through the gate.
|
||||||
|
const numberWords = [
|
||||||
|
"zero",
|
||||||
|
"one",
|
||||||
|
"two",
|
||||||
|
"three",
|
||||||
|
"four",
|
||||||
|
"five",
|
||||||
|
"six",
|
||||||
|
"seven",
|
||||||
|
"eight",
|
||||||
|
"nine",
|
||||||
|
"ten",
|
||||||
|
"eleven",
|
||||||
|
"twelve",
|
||||||
|
"twenty",
|
||||||
|
"thirty",
|
||||||
|
"forty",
|
||||||
|
"fifty",
|
||||||
|
"hundred",
|
||||||
|
"thousand",
|
||||||
|
"million",
|
||||||
|
];
|
||||||
|
const hasNumberWord = numberWords.some((word) => new RegExp(`\\b${word}\\b`).test(text));
|
||||||
|
// A bare number is not a problem; a number with an operation is.
|
||||||
|
return (hasDigit || hasSymbol || hasNumberWord) && (hasOperatorWord || hasSymbol);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Result
|
||||||
|
|
||||||
|
export type MathSessionPayload =
|
||||||
|
| { kind: "solution"; solution: MathSolution }
|
||||||
|
| { kind: "graph"; graph: Graph }
|
||||||
|
| { kind: "step"; step: SolutionStep; index: number; total: number }
|
||||||
|
| { kind: "message"; message: string }
|
||||||
|
| { kind: "failure"; message: string }
|
||||||
|
/**
|
||||||
|
* An advanced-topic answer, which has its own field list rather than a
|
||||||
|
* solution's step sequence.
|
||||||
|
*/
|
||||||
|
| { kind: "topic"; headline: string; detail: string; fields: string[] };
|
||||||
|
|
||||||
|
export type MathSessionResult = {
|
||||||
|
payload: MathSessionPayload;
|
||||||
|
/** One short line for the glasses. */
|
||||||
|
headline: string;
|
||||||
|
/** Fuller text for the answer view and for spoken readback. */
|
||||||
|
detail: string;
|
||||||
|
/**
|
||||||
|
* Work this answer could not finish at the fast depth. The caller decides
|
||||||
|
* whether to offer the wearer a longer run, or let the shallow answer
|
||||||
|
* stand.
|
||||||
|
*/
|
||||||
|
unresolvedWorkload: MathWorkload | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
function result(
|
||||||
|
payload: MathSessionPayload,
|
||||||
|
headline: string,
|
||||||
|
detail: string,
|
||||||
|
unresolvedWorkload: MathWorkload | null = null,
|
||||||
|
): MathSessionResult {
|
||||||
|
return { payload, headline, detail, unresolvedWorkload };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Session
|
||||||
|
|
||||||
|
/** Holds one problem and everything derived from it, so follow-ups work. */
|
||||||
|
export class MathSession {
|
||||||
|
private expression: MathExpression | null = null;
|
||||||
|
private solution: MathSolution | null = null;
|
||||||
|
private stepIndex = 0;
|
||||||
|
private usesDegrees: boolean;
|
||||||
|
|
||||||
|
constructor(usesDegrees = false) {
|
||||||
|
this.usesDegrees = usesDegrees;
|
||||||
|
}
|
||||||
|
|
||||||
|
get hasProblem(): boolean {
|
||||||
|
return this.expression !== null;
|
||||||
|
}
|
||||||
|
|
||||||
|
get currentSolution(): MathSolution | null {
|
||||||
|
return this.solution;
|
||||||
|
}
|
||||||
|
|
||||||
|
setUsesDegrees(value: boolean): void {
|
||||||
|
this.usesDegrees = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private get context(): EvaluatorContext {
|
||||||
|
const context = radiansContext();
|
||||||
|
context.usesDegrees = this.usesDegrees;
|
||||||
|
return context;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Entry point --------------------------------------------------------------
|
||||||
|
|
||||||
|
handle(utterance: string): MathSessionResult | null {
|
||||||
|
const command = parseCommand(utterance);
|
||||||
|
if (!command) return null;
|
||||||
|
return this.execute(command);
|
||||||
|
}
|
||||||
|
|
||||||
|
execute(command: MathCommand): MathSessionResult {
|
||||||
|
switch (command.kind) {
|
||||||
|
case "problem":
|
||||||
|
return this.solve(command.text);
|
||||||
|
case "graph":
|
||||||
|
return this.graph();
|
||||||
|
case "explain":
|
||||||
|
return this.explain();
|
||||||
|
case "nextStep":
|
||||||
|
return this.moveStep(1);
|
||||||
|
case "previousStep":
|
||||||
|
return this.moveStep(-1);
|
||||||
|
case "derivative":
|
||||||
|
return this.differentiate(command.variable === "" ? null : command.variable);
|
||||||
|
case "integrate":
|
||||||
|
return this.integrate(command.variable, command.from, command.to);
|
||||||
|
case "restate":
|
||||||
|
return this.restate();
|
||||||
|
case "advanced": {
|
||||||
|
const answer = answerAdvanced(command.topic);
|
||||||
|
return result(
|
||||||
|
{
|
||||||
|
kind: "topic",
|
||||||
|
headline: answer.headline,
|
||||||
|
detail: answer.detail,
|
||||||
|
fields: answer.fields.map(([label, value]) => `${label}: ${value}`),
|
||||||
|
},
|
||||||
|
answer.headline,
|
||||||
|
answer.detail,
|
||||||
|
answer.unresolvedWorkload,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
case "clear":
|
||||||
|
this.expression = null;
|
||||||
|
this.solution = null;
|
||||||
|
this.stepIndex = 0;
|
||||||
|
return result({ kind: "message", message: "Cleared" }, "Cleared", "Ready for a new problem.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Commands -----------------------------------------------------------------
|
||||||
|
|
||||||
|
solve(text: string): MathSessionResult {
|
||||||
|
let parsed: MathExpression;
|
||||||
|
try {
|
||||||
|
parsed = parseSpoken(text);
|
||||||
|
} catch (error) {
|
||||||
|
const message =
|
||||||
|
error instanceof MathParseError ? error.message : String((error as Error)?.message ?? error);
|
||||||
|
return result({ kind: "failure", message }, "Could not read that", message);
|
||||||
|
}
|
||||||
|
const solved = solveExpression(parsed, null, this.context);
|
||||||
|
this.expression = parsed;
|
||||||
|
this.solution = solved;
|
||||||
|
this.stepIndex = 0;
|
||||||
|
return result(
|
||||||
|
{ kind: "solution", solution: solved },
|
||||||
|
solutionHeadline(solved),
|
||||||
|
`${plain(solved.restatement)} → ${solutionHeadline(solved)}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
graph(viewport: GraphViewport | null = null): MathSessionResult {
|
||||||
|
if (!this.expression) return this.noProblem();
|
||||||
|
const plotted = plot([this.expression], {
|
||||||
|
viewport: viewport ?? undefined,
|
||||||
|
usesDegrees: this.usesDegrees,
|
||||||
|
});
|
||||||
|
const pointCount = plotted.plots.reduce(
|
||||||
|
(total, entry) => total + entry.segments.reduce((count, segment) => count + segment.points.length, 0),
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
if (pointCount <= 1) {
|
||||||
|
return result(
|
||||||
|
{ kind: "failure", message: "Nothing to plot" },
|
||||||
|
"Nothing to plot",
|
||||||
|
"That expression has no real values in the visible window.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const label = plotted.plots[0]?.label ?? "";
|
||||||
|
return result(
|
||||||
|
{ kind: "graph", graph: plotted },
|
||||||
|
`y = ${label}`,
|
||||||
|
`x from ${format(plotted.viewport.xMin)} to ${format(plotted.viewport.xMax)}, ` +
|
||||||
|
`y from ${format(plotted.viewport.yMin)} to ${format(plotted.viewport.yMax)}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
explain(): MathSessionResult {
|
||||||
|
const solution = this.solution;
|
||||||
|
if (!solution || solution.steps.length === 0) return this.noProblem();
|
||||||
|
this.stepIndex = 0;
|
||||||
|
return this.stepResult(0, solution);
|
||||||
|
}
|
||||||
|
|
||||||
|
private moveStep(delta: number): MathSessionResult {
|
||||||
|
const solution = this.solution;
|
||||||
|
if (!solution || solution.steps.length === 0) return this.noProblem();
|
||||||
|
// Clamp rather than wrap: a wearer scrolling past the end should land on
|
||||||
|
// the answer and stay there, not loop back to the start.
|
||||||
|
this.stepIndex = Math.max(0, Math.min(solution.steps.length - 1, this.stepIndex + delta));
|
||||||
|
return this.stepResult(this.stepIndex, solution);
|
||||||
|
}
|
||||||
|
|
||||||
|
private stepResult(index: number, solution: MathSolution): MathSessionResult {
|
||||||
|
const step = solution.steps[index]!;
|
||||||
|
return result(
|
||||||
|
{ kind: "step", step, index, total: solution.steps.length },
|
||||||
|
`${index + 1}/${solution.steps.length} ${step.title}`,
|
||||||
|
`${plain(step.expression)}\n${step.detail}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
differentiate(requestedVariable: string | null): MathSessionResult {
|
||||||
|
if (!this.expression) return this.noProblem();
|
||||||
|
const body = functionBody(this.expression);
|
||||||
|
const variable = requestedVariable ?? variablesOf(body)[0] ?? "x";
|
||||||
|
const derived = differentiate(body, variable);
|
||||||
|
const derivedSolution: MathSolution = {
|
||||||
|
kind: { kind: "simplified", value: derived },
|
||||||
|
variable,
|
||||||
|
steps: [
|
||||||
|
{
|
||||||
|
id: 0,
|
||||||
|
title: "Original",
|
||||||
|
expression: body,
|
||||||
|
detail: `Differentiate with respect to ${variable}.`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 1,
|
||||||
|
title: "Derivative",
|
||||||
|
expression: derived,
|
||||||
|
detail: "Apply the power, product, and chain rules, then simplify.",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
restatement: body,
|
||||||
|
};
|
||||||
|
this.expression = derived;
|
||||||
|
this.solution = derivedSolution;
|
||||||
|
this.stepIndex = 0;
|
||||||
|
return result(
|
||||||
|
{ kind: "solution", solution: derivedSolution },
|
||||||
|
`d/d${variable} = ${plain(derived)}`,
|
||||||
|
`The derivative of ${plain(body)} with respect to ${variable} is ${plain(derived)}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
integrate(requestedVariable: string | null, lower: number, upper: number): MathSessionResult {
|
||||||
|
if (!this.expression) return this.noProblem();
|
||||||
|
const body = functionBody(this.expression);
|
||||||
|
const variable = requestedVariable ?? variablesOf(body)[0] ?? "x";
|
||||||
|
const area = integrateNumeric(body, variable, lower, upper);
|
||||||
|
if (area === null) {
|
||||||
|
return result(
|
||||||
|
{ kind: "failure", message: "Could not integrate over that range" },
|
||||||
|
"Could not integrate",
|
||||||
|
`The function is undefined somewhere between ${format(lower)} and ${format(upper)}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const value = fromDecimal(area);
|
||||||
|
return result(
|
||||||
|
{ kind: "message", message: describeNumber(value) },
|
||||||
|
`∫ = ${describeNumber(value)}`,
|
||||||
|
`The definite integral of ${plain(body)} d${variable} ` +
|
||||||
|
`from ${format(lower)} to ${format(upper)} is ${describeNumber(value)}.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
restate(): MathSessionResult {
|
||||||
|
const solution = this.solution;
|
||||||
|
if (!solution) return this.noProblem();
|
||||||
|
return result(
|
||||||
|
{ kind: "solution", solution },
|
||||||
|
solutionHeadline(solution),
|
||||||
|
`${plain(solution.restatement)} → ${solutionHeadline(solution)}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helpers ------------------------------------------------------------------
|
||||||
|
|
||||||
|
private noProblem(): MathSessionResult {
|
||||||
|
return result(
|
||||||
|
{ kind: "failure", message: "No problem yet" },
|
||||||
|
"No problem yet",
|
||||||
|
"Say an equation first, then ask to graph or explain it.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function format(value: number): string {
|
||||||
|
return describeNumber(fromDecimal(value));
|
||||||
|
}
|
||||||
@@ -0,0 +1,361 @@
|
|||||||
|
// Canonicalises an expression tree. The goal is not a full CAS — it is a
|
||||||
|
// *stable canonical form*, because three downstream features depend on one:
|
||||||
|
//
|
||||||
|
// * the solver compares subtrees for equality to collect like terms,
|
||||||
|
// * the step explanations need `2x + 3x` to visibly become `5x`,
|
||||||
|
// * the renderers should not print `1 * x + 0`.
|
||||||
|
//
|
||||||
|
// Rewriting runs to a fixed point with an iteration cap, so a rule pair that
|
||||||
|
// oscillates degrades to "stopped early" rather than hanging the app.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
type MathFunction,
|
||||||
|
ONE,
|
||||||
|
ZERO,
|
||||||
|
addExpr,
|
||||||
|
expressionEquals,
|
||||||
|
fn,
|
||||||
|
functionIsDefined,
|
||||||
|
evaluateFunction,
|
||||||
|
isOneExpr,
|
||||||
|
isZeroExpr,
|
||||||
|
multiplyExpr,
|
||||||
|
negate,
|
||||||
|
num,
|
||||||
|
numberValue,
|
||||||
|
powerExpr,
|
||||||
|
relation,
|
||||||
|
variablesOf,
|
||||||
|
} from "./expression";
|
||||||
|
import {
|
||||||
|
type MathNumber,
|
||||||
|
add,
|
||||||
|
doubleValue,
|
||||||
|
fromDecimal,
|
||||||
|
integer,
|
||||||
|
integerValue,
|
||||||
|
isExact,
|
||||||
|
isOne,
|
||||||
|
isZero,
|
||||||
|
isNegative,
|
||||||
|
multiply,
|
||||||
|
negated,
|
||||||
|
numberEquals,
|
||||||
|
raisedTo,
|
||||||
|
rational,
|
||||||
|
} from "./math-number";
|
||||||
|
|
||||||
|
const MAXIMUM_PASSES = 24;
|
||||||
|
|
||||||
|
export function simplify(expression: MathExpression): MathExpression {
|
||||||
|
let current = expression;
|
||||||
|
for (let iteration = 0; iteration < MAXIMUM_PASSES; iteration++) {
|
||||||
|
const next = pass(current);
|
||||||
|
if (expressionEquals(next, current)) return next;
|
||||||
|
current = next;
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// One rewrite pass
|
||||||
|
|
||||||
|
function pass(expression: MathExpression): MathExpression {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number":
|
||||||
|
case "variable":
|
||||||
|
case "constant":
|
||||||
|
return expression;
|
||||||
|
|
||||||
|
case "negate": {
|
||||||
|
const simplified = pass(expression.inner);
|
||||||
|
const value = numberValue(simplified);
|
||||||
|
if (value) return num(negated(value));
|
||||||
|
// Double negation.
|
||||||
|
if (simplified.type === "negate") return simplified.inner;
|
||||||
|
return negate(simplified);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "add":
|
||||||
|
return simplifySum(expression.terms.map(pass));
|
||||||
|
|
||||||
|
case "multiply":
|
||||||
|
return simplifyProduct(expression.factors.map(pass));
|
||||||
|
|
||||||
|
case "power":
|
||||||
|
return simplifyPower(pass(expression.base), pass(expression.exponent));
|
||||||
|
|
||||||
|
case "function": {
|
||||||
|
const simplified = expression.args.map(pass);
|
||||||
|
// Fold a constant argument, but only when the result stays clean —
|
||||||
|
// `sqrt(2)` must remain symbolic, not become 1.4142135623730951 in the
|
||||||
|
// middle of an exact solution.
|
||||||
|
const first = simplified[0];
|
||||||
|
if (first) {
|
||||||
|
const value = numberValue(first);
|
||||||
|
if (value) {
|
||||||
|
const folded = foldFunction(expression.fn, value);
|
||||||
|
if (folded) return num(folded);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fn(expression.fn, simplified);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "relation":
|
||||||
|
return relation(expression.relation, pass(expression.lhs), pass(expression.rhs));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Sums
|
||||||
|
|
||||||
|
function simplifySum(rawTerms: MathExpression[]): MathExpression {
|
||||||
|
const flattened: MathExpression[] = [];
|
||||||
|
for (const term of rawTerms) {
|
||||||
|
if (term.type === "add") {
|
||||||
|
flattened.push(...term.terms);
|
||||||
|
} else {
|
||||||
|
flattened.push(term);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collect like terms by their non-numeric part: 2x + 3x → 5x.
|
||||||
|
let constantTotal: MathNumber = integer(0);
|
||||||
|
const collected: { key: MathExpression; coefficient: MathNumber }[] = [];
|
||||||
|
|
||||||
|
for (const term of flattened) {
|
||||||
|
const value = numberValue(term);
|
||||||
|
if (value) {
|
||||||
|
constantTotal = add(constantTotal, value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const [coefficient, key] = splitCoefficient(term);
|
||||||
|
const existing = collected.find((entry) => expressionEquals(entry.key, key));
|
||||||
|
if (existing) {
|
||||||
|
existing.coefficient = add(existing.coefficient, coefficient);
|
||||||
|
} else {
|
||||||
|
collected.push({ key, coefficient });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const terms: MathExpression[] = [];
|
||||||
|
for (const entry of collected) {
|
||||||
|
if (isZero(entry.coefficient)) continue;
|
||||||
|
terms.push(rebuild(entry.coefficient, entry.key));
|
||||||
|
}
|
||||||
|
// Stable ordering: highest polynomial degree first, which is how a person
|
||||||
|
// writes it and how the quadratic solver expects to read it.
|
||||||
|
terms.sort((a, b) => degree(b) - degree(a));
|
||||||
|
|
||||||
|
if (!isZero(constantTotal)) terms.push(num(constantTotal));
|
||||||
|
if (terms.length === 0) return ZERO;
|
||||||
|
return terms.length === 1 ? terms[0]! : addExpr(terms);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Split a term into its numeric coefficient and the rest, so like terms can
|
||||||
|
* be matched: `3 * x * y` → (3, x*y), `-x` → (-1, x).
|
||||||
|
*/
|
||||||
|
export function splitCoefficient(term: MathExpression): [MathNumber, MathExpression] {
|
||||||
|
switch (term.type) {
|
||||||
|
case "negate": {
|
||||||
|
const [coefficient, key] = splitCoefficient(term.inner);
|
||||||
|
return [negated(coefficient), key];
|
||||||
|
}
|
||||||
|
case "multiply": {
|
||||||
|
let coefficient: MathNumber = integer(1);
|
||||||
|
const rest: MathExpression[] = [];
|
||||||
|
for (const factor of term.factors) {
|
||||||
|
const value = numberValue(factor);
|
||||||
|
if (value) {
|
||||||
|
coefficient = multiply(coefficient, value);
|
||||||
|
} else {
|
||||||
|
rest.push(factor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (rest.length === 0) return [coefficient, ONE];
|
||||||
|
return [coefficient, rest.length === 1 ? rest[0]! : multiplyExpr(rest)];
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return [integer(1), term];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function rebuild(coefficient: MathNumber, key: MathExpression): MathExpression {
|
||||||
|
if (isOneExpr(key)) return num(coefficient);
|
||||||
|
if (isOne(coefficient)) return key;
|
||||||
|
if (numberEquals(coefficient, integer(-1))) return negate(key);
|
||||||
|
return multiplyExpr([num(coefficient), key]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Products
|
||||||
|
|
||||||
|
function simplifyProduct(rawFactors: MathExpression[]): MathExpression {
|
||||||
|
const flattened: MathExpression[] = [];
|
||||||
|
let sign = false;
|
||||||
|
for (const factor of rawFactors) {
|
||||||
|
if (factor.type === "multiply") {
|
||||||
|
flattened.push(...factor.factors);
|
||||||
|
} else if (factor.type === "negate") {
|
||||||
|
// Pull negation out to the front rather than leaving it buried, so
|
||||||
|
// `(-x) * (-y)` cancels to `x * y`.
|
||||||
|
sign = !sign;
|
||||||
|
flattened.push(factor.inner);
|
||||||
|
} else {
|
||||||
|
flattened.push(factor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let coefficient: MathNumber = integer(1);
|
||||||
|
// Collect powers with matching bases: x * x^2 → x^3.
|
||||||
|
const bases: { base: MathExpression; exponents: MathExpression[] }[] = [];
|
||||||
|
|
||||||
|
for (const factor of flattened) {
|
||||||
|
const value = numberValue(factor);
|
||||||
|
if (value) {
|
||||||
|
coefficient = multiply(coefficient, value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const [base, exponent] = splitPower(factor);
|
||||||
|
const existing = bases.find((entry) => expressionEquals(entry.base, base));
|
||||||
|
if (existing) {
|
||||||
|
existing.exponents.push(exponent);
|
||||||
|
} else {
|
||||||
|
bases.push({ base, exponents: [exponent] });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isZero(coefficient)) return ZERO;
|
||||||
|
|
||||||
|
const factors: MathExpression[] = [];
|
||||||
|
for (const entry of bases) {
|
||||||
|
const exponent = entry.exponents.length === 1 ? entry.exponents[0]! : simplify(addExpr(entry.exponents));
|
||||||
|
if (isZeroExpr(exponent)) continue; // x^0 = 1
|
||||||
|
if (isOneExpr(exponent)) {
|
||||||
|
factors.push(entry.base);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
factors.push(powerExpr(entry.base, exponent));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sign) coefficient = negated(coefficient);
|
||||||
|
if (factors.length === 0) return num(coefficient);
|
||||||
|
if (!isOne(coefficient)) {
|
||||||
|
if (numberEquals(coefficient, integer(-1))) {
|
||||||
|
return negate(factors.length === 1 ? factors[0]! : multiplyExpr(factors));
|
||||||
|
}
|
||||||
|
factors.unshift(num(coefficient));
|
||||||
|
}
|
||||||
|
return factors.length === 1 ? factors[0]! : multiplyExpr(factors);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function splitPower(expression: MathExpression): [MathExpression, MathExpression] {
|
||||||
|
if (expression.type === "power") return [expression.base, expression.exponent];
|
||||||
|
return [expression, ONE];
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Powers
|
||||||
|
|
||||||
|
function simplifyPower(base: MathExpression, exponent: MathExpression): MathExpression {
|
||||||
|
if (isZeroExpr(exponent)) return ONE; // x^0 = 1
|
||||||
|
if (isOneExpr(exponent)) return base; // x^1 = x
|
||||||
|
if (isOneExpr(base)) return ONE; // 1^n = 1
|
||||||
|
const exponentValue = numberValue(exponent);
|
||||||
|
if (isZeroExpr(base) && exponentValue && !isNegative(exponentValue)) return ZERO;
|
||||||
|
|
||||||
|
// Fold a numeric power only when it stays exact. `2^0.5` must stay
|
||||||
|
// symbolic so an exact answer does not silently become a float.
|
||||||
|
const baseValue = numberValue(base);
|
||||||
|
if (baseValue && exponentValue) {
|
||||||
|
const result = raisedTo(baseValue, exponentValue);
|
||||||
|
if (isExact(result) || !isExact(baseValue) || !isExact(exponentValue)) {
|
||||||
|
return num(result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// (x^a)^b = x^(a*b)
|
||||||
|
if (base.type === "power") {
|
||||||
|
return powerExpr(base.base, simplify(multiplyExpr([base.exponent, exponent])));
|
||||||
|
}
|
||||||
|
return powerExpr(base, exponent);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Function folding
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fold only where the result is exact or the input was already inexact. This
|
||||||
|
* is what keeps `sqrt(2)` symbolic while `sqrt(9)` becomes 3.
|
||||||
|
*/
|
||||||
|
function foldFunction(name: MathFunction, value: MathNumber): MathNumber | null {
|
||||||
|
if (!functionIsDefined(name, doubleValue(value))) return null;
|
||||||
|
|
||||||
|
const asInt = integerValue(value);
|
||||||
|
if (name === "factorial" && asInt !== null && asInt >= 0 && asInt <= 20) {
|
||||||
|
let total = 1;
|
||||||
|
for (let step = 2; step <= asInt; step++) total *= step;
|
||||||
|
return integer(total);
|
||||||
|
}
|
||||||
|
if (name === "sqrt" && isExact(value)) {
|
||||||
|
const exact = raisedTo(value, rational(1, 2));
|
||||||
|
return isExact(exact) ? exact : null;
|
||||||
|
}
|
||||||
|
if (name === "floor" || name === "ceil" || name === "round" || name === "abs") {
|
||||||
|
const result = evaluateFunction(name, doubleValue(value));
|
||||||
|
return Number.isFinite(result) ? fromDecimal(result) : null;
|
||||||
|
}
|
||||||
|
// Inexact input already lost exactness, so folding costs nothing.
|
||||||
|
if (isExact(value)) return null;
|
||||||
|
const result = evaluateFunction(name, doubleValue(value));
|
||||||
|
return Number.isFinite(result) ? { kind: "real", value: result } : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Degree
|
||||||
|
|
||||||
|
const NON_POLYNOMIAL = Math.floor(Number.MAX_SAFE_INTEGER / 4);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Polynomial degree in the given variable (or the highest across all
|
||||||
|
* variables when none is named). Drives term ordering and lets the solver
|
||||||
|
* pick a strategy.
|
||||||
|
*/
|
||||||
|
export function degree(expression: MathExpression, inVariable: string | null = null): number {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number":
|
||||||
|
case "constant":
|
||||||
|
return 0;
|
||||||
|
case "variable":
|
||||||
|
return inVariable === null || inVariable === expression.name ? 1 : 0;
|
||||||
|
case "negate":
|
||||||
|
return degree(expression.inner, inVariable);
|
||||||
|
case "add":
|
||||||
|
return expression.terms.reduce((highest, term) => Math.max(highest, degree(term, inVariable)), 0);
|
||||||
|
case "multiply":
|
||||||
|
return expression.factors.reduce((total, factor) => total + degree(factor, inVariable), 0);
|
||||||
|
case "power": {
|
||||||
|
const value = numberValue(expression.exponent);
|
||||||
|
const power = value ? integerValue(value) : null;
|
||||||
|
if (power === null) {
|
||||||
|
// A symbolic exponent is not a polynomial degree; report 0 for a
|
||||||
|
// constant base and a large sentinel otherwise so the solver does not
|
||||||
|
// mistake it for something it can factor.
|
||||||
|
return variablesOf(expression.base).length === 0 ? 0 : NON_POLYNOMIAL;
|
||||||
|
}
|
||||||
|
return degree(expression.base, inVariable) * power;
|
||||||
|
}
|
||||||
|
case "function":
|
||||||
|
// Any variable inside a transcendental function makes this
|
||||||
|
// non-polynomial.
|
||||||
|
return expression.args.some((argument) => variablesOf(argument).length > 0) ? NON_POLYNOMIAL : 0;
|
||||||
|
case "relation":
|
||||||
|
return Math.max(degree(expression.lhs, inVariable), degree(expression.rhs, inVariable));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** True when the expression is a genuine polynomial in `variable`. */
|
||||||
|
export function isPolynomial(expression: MathExpression, inVariable: string): boolean {
|
||||||
|
return degree(expression, inVariable) < NON_POLYNOMIAL / 2;
|
||||||
|
}
|
||||||
@@ -0,0 +1,781 @@
|
|||||||
|
// Solves what a person actually asks a calculator, in the order of
|
||||||
|
// likelihood: evaluate an arithmetic expression, solve a linear or quadratic
|
||||||
|
// equation, find polynomial roots, or fall back to a numeric search.
|
||||||
|
//
|
||||||
|
// Every branch records SolutionSteps as it goes, because "explain it" is a
|
||||||
|
// first-class feature here rather than a reconstruction after the fact — a
|
||||||
|
// post-hoc explanation of a numeric root search would be fiction.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
type MathRelation,
|
||||||
|
ZERO,
|
||||||
|
addExpr,
|
||||||
|
divideExpr,
|
||||||
|
expressionEquals,
|
||||||
|
flippedRelation,
|
||||||
|
fn,
|
||||||
|
int,
|
||||||
|
multiplyExpr,
|
||||||
|
negate,
|
||||||
|
num,
|
||||||
|
numberValue,
|
||||||
|
relation as relationExpr,
|
||||||
|
spokenRelation,
|
||||||
|
subtractExpr,
|
||||||
|
variable as variableExpr,
|
||||||
|
variablesOf,
|
||||||
|
} from "./expression";
|
||||||
|
import {
|
||||||
|
type MathNumber,
|
||||||
|
add,
|
||||||
|
describeNumber,
|
||||||
|
doubleValue,
|
||||||
|
fromDecimal,
|
||||||
|
integer,
|
||||||
|
isExact,
|
||||||
|
isNegative,
|
||||||
|
isZero,
|
||||||
|
multiply,
|
||||||
|
negated,
|
||||||
|
divide as divideNumber,
|
||||||
|
raisedTo,
|
||||||
|
rational,
|
||||||
|
real,
|
||||||
|
subtract,
|
||||||
|
} from "./math-number";
|
||||||
|
import { type EvaluatorContext, evaluateExact, evaluateValue, radiansContext } from "./evaluator";
|
||||||
|
import { simplify } from "./simplifier";
|
||||||
|
import { Polynomial } from "./polynomial";
|
||||||
|
import { plain, renderNumber } from "./text-renderer";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Steps
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One line of "explain it". Recorded by the solver as it works rather than
|
||||||
|
* reconstructed afterwards.
|
||||||
|
*/
|
||||||
|
export type SolutionStep = {
|
||||||
|
id: number;
|
||||||
|
/** Short imperative title — what was done ("Divide by 2"). */
|
||||||
|
title: string;
|
||||||
|
/** The expression AFTER this step. */
|
||||||
|
expression: MathExpression;
|
||||||
|
/** Plain-language reason, shown under the title. */
|
||||||
|
detail: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function stepPlain(step: SolutionStep): string {
|
||||||
|
return plain(step.expression);
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SolutionStepRecorder {
|
||||||
|
readonly steps: SolutionStep[] = [];
|
||||||
|
|
||||||
|
add(title: string, expression: MathExpression, detail: string): void {
|
||||||
|
// Collapse a step that changed nothing — "Simplify: 2x + 1" following
|
||||||
|
// "Start: 2x + 1" is noise that makes a short solve look laborious.
|
||||||
|
const last = this.steps[this.steps.length - 1];
|
||||||
|
if (last && expressionEquals(last.expression, expression)) return;
|
||||||
|
this.steps.push({ id: this.steps.length, title, expression, detail });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Solution
|
||||||
|
|
||||||
|
export type MathSolutionKind =
|
||||||
|
/** A finite set of values for the unknown. */
|
||||||
|
| { kind: "roots"; roots: MathExpression[] }
|
||||||
|
/** The relation holds for every value (`x = x`). */
|
||||||
|
| { kind: "identity" }
|
||||||
|
/** It holds for none (`0 = 1`). */
|
||||||
|
| { kind: "contradiction" }
|
||||||
|
/** A single evaluated value — the answer to "what is 2+2". */
|
||||||
|
| { kind: "value"; value: MathExpression }
|
||||||
|
/** Simplified but not solved (no unknown to solve for). */
|
||||||
|
| { kind: "simplified"; value: MathExpression }
|
||||||
|
/** An inequality's solution interval. */
|
||||||
|
| {
|
||||||
|
kind: "interval";
|
||||||
|
lower: MathExpression | null;
|
||||||
|
upper: MathExpression | null;
|
||||||
|
relation: MathRelation;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type MathSolution = {
|
||||||
|
kind: MathSolutionKind;
|
||||||
|
variable: string | null;
|
||||||
|
steps: SolutionStep[];
|
||||||
|
/**
|
||||||
|
* The input as the engine understood it, so a wearer can confirm the
|
||||||
|
* machine heard the same problem they said.
|
||||||
|
*/
|
||||||
|
restatement: MathExpression;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The short line the glasses show. */
|
||||||
|
export function solutionHeadline(solution: MathSolution): string {
|
||||||
|
const kind = solution.kind;
|
||||||
|
switch (kind.kind) {
|
||||||
|
case "roots":
|
||||||
|
if (kind.roots.length === 0) return "No real solution";
|
||||||
|
return kind.roots.map((root) => `${solution.variable ?? "x"} = ${plain(root)}`).join(", ");
|
||||||
|
case "identity":
|
||||||
|
return "True for every value";
|
||||||
|
case "contradiction":
|
||||||
|
return "No solution";
|
||||||
|
case "value":
|
||||||
|
return plain(kind.value);
|
||||||
|
case "simplified":
|
||||||
|
return plain(kind.value);
|
||||||
|
case "interval":
|
||||||
|
return intervalText(kind.lower, kind.upper, kind.relation, solution.variable);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function intervalText(
|
||||||
|
lower: MathExpression | null,
|
||||||
|
upper: MathExpression | null,
|
||||||
|
relation: MathRelation,
|
||||||
|
variable: string | null,
|
||||||
|
): string {
|
||||||
|
const name = variable ?? "x";
|
||||||
|
if (lower && !upper) return `${name} ${relation} ${plain(lower)}`;
|
||||||
|
if (upper && !lower) return `${name} ${relation} ${plain(upper)}`;
|
||||||
|
if (lower && upper) return `${plain(lower)} < ${name} < ${plain(upper)}`;
|
||||||
|
return `all ${name}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Solver
|
||||||
|
|
||||||
|
export function solve(
|
||||||
|
expression: MathExpression,
|
||||||
|
solveFor: string | null = null,
|
||||||
|
context: EvaluatorContext = radiansContext(),
|
||||||
|
): MathSolution {
|
||||||
|
const steps = new SolutionStepRecorder();
|
||||||
|
const simplified = simplify(expression);
|
||||||
|
|
||||||
|
if (simplified.type !== "relation") {
|
||||||
|
return evaluateExpression(simplified, expression, context, steps);
|
||||||
|
}
|
||||||
|
|
||||||
|
const relation = simplified.relation;
|
||||||
|
const lhs = simplified.lhs;
|
||||||
|
const rhs = simplified.rhs;
|
||||||
|
|
||||||
|
const variable = solveFor ?? variablesOf(simplified)[0] ?? null;
|
||||||
|
if (!variable) {
|
||||||
|
// No unknown: this is a claim to check, not an equation to solve.
|
||||||
|
return checkClaim(relation, lhs, rhs, expression, context);
|
||||||
|
}
|
||||||
|
|
||||||
|
steps.add("Start", simplified, `Solve for ${variable}.`);
|
||||||
|
|
||||||
|
// Move everything to the left: lhs - rhs (relation) 0.
|
||||||
|
const difference = simplify(subtractExpr(lhs, rhs));
|
||||||
|
if (!(rhs.type === "number" && isZero(rhs.value))) {
|
||||||
|
steps.add(
|
||||||
|
"Move every term to one side",
|
||||||
|
relationExpr(relation, difference, ZERO),
|
||||||
|
`Subtract ${plain(rhs)} from both sides.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const polynomial = Polynomial.extract(difference, variable);
|
||||||
|
if (!polynomial) {
|
||||||
|
return solveNumerically(difference, relation, variable, expression, context, steps);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (relation !== "=") {
|
||||||
|
return solveInequality(polynomial, relation, variable, expression, steps);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (polynomial.degree) {
|
||||||
|
case 0: {
|
||||||
|
// No unknown survived: either always true or never.
|
||||||
|
const constant = polynomial.at(0);
|
||||||
|
const kind: MathSolutionKind = isZero(constant) ? { kind: "identity" } : { kind: "contradiction" };
|
||||||
|
steps.add(
|
||||||
|
isZero(constant) ? "Every value works" : "No value works",
|
||||||
|
relationExpr("=", num(constant), ZERO),
|
||||||
|
isZero(constant)
|
||||||
|
? `${variable} cancelled out and the statement is true.`
|
||||||
|
: `${variable} cancelled out and ${describeNumber(constant)} ≠ 0.`,
|
||||||
|
);
|
||||||
|
return { kind, variable, steps: steps.steps, restatement: simplified };
|
||||||
|
}
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
return solveLinear(polynomial, variable, simplified, steps);
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
return solveQuadratic(polynomial, variable, simplified, steps);
|
||||||
|
|
||||||
|
default:
|
||||||
|
return solvePolynomial(polynomial, variable, simplified, steps);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Plain expressions
|
||||||
|
|
||||||
|
function evaluateExpression(
|
||||||
|
simplified: MathExpression,
|
||||||
|
original: MathExpression,
|
||||||
|
context: EvaluatorContext,
|
||||||
|
steps: SolutionStepRecorder,
|
||||||
|
): MathSolution {
|
||||||
|
steps.add("Start", original, "Evaluate the expression.");
|
||||||
|
if (!expressionEquals(simplified, original)) {
|
||||||
|
steps.add("Simplify", simplified, "Combine like terms and constants.");
|
||||||
|
}
|
||||||
|
let value: MathNumber | null = null;
|
||||||
|
try {
|
||||||
|
value = evaluateExact(simplified, context);
|
||||||
|
} catch {
|
||||||
|
value = null;
|
||||||
|
}
|
||||||
|
if (value !== null) {
|
||||||
|
const result = num(value);
|
||||||
|
if (!expressionEquals(result, simplified)) {
|
||||||
|
steps.add("Result", result, "Evaluate what is left.");
|
||||||
|
}
|
||||||
|
return { kind: { kind: "value", value: result }, variable: null, steps: steps.steps, restatement: original };
|
||||||
|
}
|
||||||
|
// Free variables remain — the best answer is the simplified form.
|
||||||
|
return {
|
||||||
|
kind: { kind: "simplified", value: simplified },
|
||||||
|
variable: null,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkClaim(
|
||||||
|
relation: MathRelation,
|
||||||
|
lhs: MathExpression,
|
||||||
|
rhs: MathExpression,
|
||||||
|
original: MathExpression,
|
||||||
|
context: EvaluatorContext,
|
||||||
|
): MathSolution {
|
||||||
|
const steps = new SolutionStepRecorder();
|
||||||
|
steps.add("Start", original, "Check whether this is true.");
|
||||||
|
let left: MathNumber;
|
||||||
|
let right: MathNumber;
|
||||||
|
try {
|
||||||
|
left = evaluateExact(lhs, context);
|
||||||
|
right = evaluateExact(rhs, context);
|
||||||
|
} catch {
|
||||||
|
return {
|
||||||
|
kind: { kind: "simplified", value: original },
|
||||||
|
variable: null,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
steps.add(
|
||||||
|
"Evaluate both sides",
|
||||||
|
relationExpr(relation, num(left), num(right)),
|
||||||
|
`${describeNumber(left)} ${spokenRelation(relation)} ${describeNumber(right)}?`,
|
||||||
|
);
|
||||||
|
let holds: boolean;
|
||||||
|
switch (relation) {
|
||||||
|
case "=":
|
||||||
|
holds = doubleValue(left) === doubleValue(right);
|
||||||
|
break;
|
||||||
|
case "<":
|
||||||
|
holds = doubleValue(left) < doubleValue(right);
|
||||||
|
break;
|
||||||
|
case "<=":
|
||||||
|
holds = doubleValue(left) <= doubleValue(right);
|
||||||
|
break;
|
||||||
|
case ">":
|
||||||
|
holds = doubleValue(left) > doubleValue(right);
|
||||||
|
break;
|
||||||
|
case ">=":
|
||||||
|
holds = doubleValue(left) >= doubleValue(right);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
kind: holds ? { kind: "identity" } : { kind: "contradiction" },
|
||||||
|
variable: null,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Linear
|
||||||
|
|
||||||
|
function solveLinear(
|
||||||
|
polynomial: Polynomial,
|
||||||
|
variable: string,
|
||||||
|
original: MathExpression,
|
||||||
|
steps: SolutionStepRecorder,
|
||||||
|
): MathSolution {
|
||||||
|
const a = polynomial.at(1);
|
||||||
|
const b = polynomial.at(0);
|
||||||
|
steps.add(
|
||||||
|
`Isolate the ${variable} term`,
|
||||||
|
relationExpr("=", multiplyExpr([num(a), variableExpr(variable)]), num(negated(b))),
|
||||||
|
`Move the constant across: ${renderNumber(a)}${variable} = ${renderNumber(negated(b))}.`,
|
||||||
|
);
|
||||||
|
const root = divideNumber(negated(b), a);
|
||||||
|
const rootExpression = num(root);
|
||||||
|
steps.add(
|
||||||
|
`Divide by ${renderNumber(a)}`,
|
||||||
|
relationExpr("=", variableExpr(variable), rootExpression),
|
||||||
|
`${variable} = ${renderNumber(negated(b))} ÷ ${renderNumber(a)} = ${renderNumber(root)}.`,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
kind: { kind: "roots", roots: [rootExpression] },
|
||||||
|
variable,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Quadratic
|
||||||
|
|
||||||
|
function solveQuadratic(
|
||||||
|
polynomial: Polynomial,
|
||||||
|
variable: string,
|
||||||
|
original: MathExpression,
|
||||||
|
steps: SolutionStepRecorder,
|
||||||
|
): MathSolution {
|
||||||
|
const a = polynomial.at(2);
|
||||||
|
const b = polynomial.at(1);
|
||||||
|
const c = polynomial.at(0);
|
||||||
|
steps.add(
|
||||||
|
"Read off the coefficients",
|
||||||
|
polynomial.expression(),
|
||||||
|
`a = ${renderNumber(a)}, b = ${renderNumber(b)}, c = ${renderNumber(c)}.`,
|
||||||
|
);
|
||||||
|
|
||||||
|
const discriminant = subtract(multiply(b, b), multiply(multiply(integer(4), a), c));
|
||||||
|
steps.add(
|
||||||
|
"Discriminant",
|
||||||
|
num(discriminant),
|
||||||
|
`b² − 4ac = ${renderNumber(b)}² − 4·${renderNumber(a)}·${renderNumber(c)} = ${renderNumber(discriminant)}.`,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (isNegative(discriminant)) {
|
||||||
|
steps.add(
|
||||||
|
"No real roots",
|
||||||
|
num(discriminant),
|
||||||
|
"The discriminant is negative, so the parabola never crosses the axis.",
|
||||||
|
);
|
||||||
|
return { kind: { kind: "roots", roots: [] }, variable, steps: steps.steps, restatement: original };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prefer an exact square root — it reads far better in a step-by-step than
|
||||||
|
// the formula does, and it is what a person would do.
|
||||||
|
const squareRoot = raisedTo(discriminant, rational(1, 2));
|
||||||
|
const exactRoot = isExact(squareRoot);
|
||||||
|
|
||||||
|
if (isZero(discriminant)) {
|
||||||
|
const root = divideNumber(negated(b), multiply(integer(2), a));
|
||||||
|
steps.add(
|
||||||
|
"One repeated root",
|
||||||
|
relationExpr("=", variableExpr(variable), num(root)),
|
||||||
|
`With a zero discriminant, ${variable} = −b / 2a = ${renderNumber(root)}.`,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
kind: { kind: "roots", roots: [num(root)] },
|
||||||
|
variable,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
steps.add(
|
||||||
|
"Quadratic formula",
|
||||||
|
relationExpr(
|
||||||
|
"=",
|
||||||
|
variableExpr(variable),
|
||||||
|
divideExpr(addExpr([negate(num(b)), fn("sqrt", [num(discriminant)])]), multiplyExpr([int(2), num(a)])),
|
||||||
|
),
|
||||||
|
"x = (−b ± √(b² − 4ac)) / 2a.",
|
||||||
|
);
|
||||||
|
|
||||||
|
const denominator = multiply(integer(2), a);
|
||||||
|
let rootExpressions: MathExpression[];
|
||||||
|
if (exactRoot) {
|
||||||
|
const first = divideNumber(add(negated(b), squareRoot), denominator);
|
||||||
|
const second = divideNumber(subtract(negated(b), squareRoot), denominator);
|
||||||
|
const ordered = [first, second].sort((x, y) => doubleValue(x) - doubleValue(y));
|
||||||
|
rootExpressions = ordered.map((value) => num(value));
|
||||||
|
steps.add(
|
||||||
|
"Exact roots",
|
||||||
|
addExpr(rootExpressions),
|
||||||
|
`√${renderNumber(discriminant)} = ${renderNumber(squareRoot)}, so the roots are exact.`,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Keep the surd symbolic: (−b ± √D) / 2a is the exact answer, and
|
||||||
|
// collapsing it to decimals throws away information the wearer may want
|
||||||
|
// to see.
|
||||||
|
const surd = fn("sqrt", [num(discriminant)]);
|
||||||
|
const plus = simplify(divideExpr(addExpr([num(negated(b)), surd]), num(denominator)));
|
||||||
|
const minus = simplify(divideExpr(subtractExpr(num(negated(b)), surd), num(denominator)));
|
||||||
|
rootExpressions = [plus, minus];
|
||||||
|
const approximate: number[] = [];
|
||||||
|
for (const root of rootExpressions) {
|
||||||
|
try {
|
||||||
|
approximate.push(doubleValue(evaluateExact(root)));
|
||||||
|
} catch {
|
||||||
|
// Leave it out of the approximation line.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps.add(
|
||||||
|
"Roots",
|
||||||
|
addExpr(rootExpressions),
|
||||||
|
approximate.length === 2
|
||||||
|
? `≈ ${formatApprox(approximate[0]!)} and ${formatApprox(approximate[1]!)}.`
|
||||||
|
: "The discriminant is not a perfect square, so the roots keep their radical.",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
kind: { kind: "roots", roots: rootExpressions },
|
||||||
|
variable,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Higher degree
|
||||||
|
|
||||||
|
function solvePolynomial(
|
||||||
|
polynomial: Polynomial,
|
||||||
|
variable: string,
|
||||||
|
original: MathExpression,
|
||||||
|
steps: SolutionStepRecorder,
|
||||||
|
): MathSolution {
|
||||||
|
steps.add(
|
||||||
|
`Degree ${polynomial.degree} polynomial`,
|
||||||
|
polynomial.expression(),
|
||||||
|
"Look for rational roots, then solve what is left.",
|
||||||
|
);
|
||||||
|
|
||||||
|
let remaining = polynomial;
|
||||||
|
const found: MathNumber[] = [];
|
||||||
|
|
||||||
|
// Rational root theorem: p/q where p divides the constant term and q
|
||||||
|
// divides the leading coefficient. Cheap, exact, and it usually cracks the
|
||||||
|
// textbook cases outright.
|
||||||
|
for (;;) {
|
||||||
|
if (remaining.degree <= 2) break;
|
||||||
|
const root = rationalRoot(remaining);
|
||||||
|
if (!root) break;
|
||||||
|
found.push(root);
|
||||||
|
remaining = remaining.dividingByRoot(root);
|
||||||
|
steps.add(
|
||||||
|
`Factor out (${variable} − ${renderNumber(root)})`,
|
||||||
|
remaining.expression(),
|
||||||
|
`${variable} = ${renderNumber(root)} is a root; divide it out.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (remaining.degree) {
|
||||||
|
case 1:
|
||||||
|
found.push(divideNumber(negated(remaining.at(0)), remaining.at(1)));
|
||||||
|
break;
|
||||||
|
case 2: {
|
||||||
|
const a = remaining.at(2);
|
||||||
|
const b = remaining.at(1);
|
||||||
|
const c = remaining.at(0);
|
||||||
|
const discriminant = subtract(multiply(b, b), multiply(multiply(integer(4), a), c));
|
||||||
|
if (!isNegative(discriminant)) {
|
||||||
|
const squareRoot = raisedTo(discriminant, rational(1, 2));
|
||||||
|
found.push(divideNumber(add(negated(b), squareRoot), multiply(integer(2), a)));
|
||||||
|
if (!isZero(discriminant)) {
|
||||||
|
found.push(divideNumber(subtract(negated(b), squareRoot), multiply(integer(2), a)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps.add(
|
||||||
|
"Solve the quadratic factor",
|
||||||
|
remaining.expression(),
|
||||||
|
"What is left is a quadratic; apply the formula.",
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
// No closed form available — find the real roots numerically.
|
||||||
|
const numeric = numericRoots(remaining);
|
||||||
|
found.push(...numeric.map((root) => fromDecimal(root)));
|
||||||
|
steps.add(
|
||||||
|
"Numeric roots",
|
||||||
|
remaining.expression(),
|
||||||
|
numeric.length === 0
|
||||||
|
? "No further real roots were found."
|
||||||
|
: "No exact factorisation remains, so the rest are found numerically.",
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const sorted = [...found].sort((x, y) => doubleValue(x) - doubleValue(y));
|
||||||
|
return {
|
||||||
|
kind: { kind: "roots", roots: sorted.map((value) => num(value)) },
|
||||||
|
variable,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function rationalRoot(polynomial: Polynomial): MathNumber | null {
|
||||||
|
const integers = polynomial.integerCoefficients;
|
||||||
|
if (!integers) return null;
|
||||||
|
const constant = integers[0];
|
||||||
|
const leading = integers[integers.length - 1];
|
||||||
|
if (!constant || !leading) return null;
|
||||||
|
|
||||||
|
const constantDivisors = divisorsOf(Math.abs(constant));
|
||||||
|
const leadingDivisors = divisorsOf(Math.abs(leading));
|
||||||
|
for (const p of constantDivisors) {
|
||||||
|
for (const q of leadingDivisors) {
|
||||||
|
for (const sign of [1, -1]) {
|
||||||
|
const candidate = rational(sign * p, q);
|
||||||
|
if (Math.abs(polynomial.value(doubleValue(candidate))) < 1e-9) {
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function divisorsOf(value: number): number[] {
|
||||||
|
if (value <= 0 || value >= 1_000_000) return [1];
|
||||||
|
const result: number[] = [];
|
||||||
|
for (let candidate = 1; candidate * candidate <= value; candidate++) {
|
||||||
|
if (value % candidate === 0) {
|
||||||
|
result.push(candidate);
|
||||||
|
if (candidate !== value / candidate) result.push(value / candidate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result.sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bracket-and-bisect over a sampled range. Bisection rather than bare Newton
|
||||||
|
* because Newton alone diverges on a bad seed, and a diverging solver on the
|
||||||
|
* lens produces nonsense rather than nothing.
|
||||||
|
*/
|
||||||
|
export function numericRoots(
|
||||||
|
polynomial: Polynomial,
|
||||||
|
searchRange: [number, number] = [-1000, 1000],
|
||||||
|
samples = 20_000,
|
||||||
|
): number[] {
|
||||||
|
if (polynomial.degree < 1) return [];
|
||||||
|
const [lower, upper] = searchRange;
|
||||||
|
const roots: number[] = [];
|
||||||
|
const step = (upper - lower) / samples;
|
||||||
|
let previousX = lower;
|
||||||
|
let previousY = polynomial.value(previousX);
|
||||||
|
|
||||||
|
for (let index = 1; index <= samples; index++) {
|
||||||
|
const x = lower + index * step;
|
||||||
|
const y = polynomial.value(x);
|
||||||
|
|
||||||
|
if (y === 0) {
|
||||||
|
roots.push(x);
|
||||||
|
previousX = x;
|
||||||
|
previousY = y;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (Math.sign(previousY) === Math.sign(y) || previousY === 0) {
|
||||||
|
previousX = x;
|
||||||
|
previousY = y;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let low = previousX;
|
||||||
|
let high = x;
|
||||||
|
for (let iteration = 0; iteration < 80; iteration++) {
|
||||||
|
const mid = (low + high) / 2;
|
||||||
|
const value = polynomial.value(mid);
|
||||||
|
if (value === 0) {
|
||||||
|
low = mid;
|
||||||
|
high = mid;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (Math.sign(value) === Math.sign(polynomial.value(low))) {
|
||||||
|
low = mid;
|
||||||
|
} else {
|
||||||
|
high = mid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
roots.push((low + high) / 2);
|
||||||
|
previousX = x;
|
||||||
|
previousY = y;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collapse near-duplicates from adjacent brackets around a tangency.
|
||||||
|
const unique: number[] = [];
|
||||||
|
for (const root of roots.sort((a, b) => a - b)) {
|
||||||
|
if (!unique.some((existing) => Math.abs(existing - root) < 1e-7)) {
|
||||||
|
unique.push(root);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return unique;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Inequalities
|
||||||
|
|
||||||
|
function solveInequality(
|
||||||
|
polynomial: Polynomial,
|
||||||
|
relation: MathRelation,
|
||||||
|
variable: string,
|
||||||
|
original: MathExpression,
|
||||||
|
steps: SolutionStepRecorder,
|
||||||
|
): MathSolution {
|
||||||
|
if (polynomial.degree !== 1) {
|
||||||
|
// Higher-degree inequalities need sign analysis across intervals; report
|
||||||
|
// the roots rather than pretending to a full solution.
|
||||||
|
const solution = solvePolynomial(polynomial, variable, original, steps);
|
||||||
|
steps.add(
|
||||||
|
"Critical points",
|
||||||
|
polynomial.expression(),
|
||||||
|
"The sign can only change at these values; test a point in each interval.",
|
||||||
|
);
|
||||||
|
return { kind: solution.kind, variable, steps: steps.steps, restatement: original };
|
||||||
|
}
|
||||||
|
|
||||||
|
const a = polynomial.at(1);
|
||||||
|
const b = polynomial.at(0);
|
||||||
|
const bound = divideNumber(negated(b), a);
|
||||||
|
// Dividing by a negative flips the inequality — the single most common
|
||||||
|
// mistake in this whole topic, so it gets its own visible step.
|
||||||
|
const finalRelation = isNegative(a) ? flippedRelation(relation) : relation;
|
||||||
|
steps.add(
|
||||||
|
`Divide by ${renderNumber(a)}`,
|
||||||
|
relationExpr(finalRelation, variableExpr(variable), num(bound)),
|
||||||
|
isNegative(a)
|
||||||
|
? `Dividing by a negative flips the inequality to ${finalRelation}.`
|
||||||
|
: `${variable} ${finalRelation} ${renderNumber(bound)}.`,
|
||||||
|
);
|
||||||
|
|
||||||
|
const isUpperBound = finalRelation === "<" || finalRelation === "<=";
|
||||||
|
return {
|
||||||
|
kind: {
|
||||||
|
kind: "interval",
|
||||||
|
lower: isUpperBound ? null : num(bound),
|
||||||
|
upper: isUpperBound ? num(bound) : null,
|
||||||
|
relation: finalRelation,
|
||||||
|
},
|
||||||
|
variable,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Non-polynomial
|
||||||
|
|
||||||
|
function solveNumerically(
|
||||||
|
difference: MathExpression,
|
||||||
|
relation: MathRelation,
|
||||||
|
variable: string,
|
||||||
|
original: MathExpression,
|
||||||
|
context: EvaluatorContext,
|
||||||
|
steps: SolutionStepRecorder,
|
||||||
|
): MathSolution {
|
||||||
|
steps.add(
|
||||||
|
"Not a polynomial",
|
||||||
|
difference,
|
||||||
|
`${variable} appears inside a function, so the roots are found numerically.`,
|
||||||
|
);
|
||||||
|
let roots: number[] = [];
|
||||||
|
const lower = -100;
|
||||||
|
const upper = 100;
|
||||||
|
const samples = 40_000;
|
||||||
|
const step = (upper - lower) / samples;
|
||||||
|
|
||||||
|
const evaluate = (x: number): number | null =>
|
||||||
|
evaluateValue(difference, { [variable]: x }, context.usesDegrees);
|
||||||
|
|
||||||
|
let previousX = lower;
|
||||||
|
let previousY = evaluate(previousX);
|
||||||
|
for (let index = 1; index <= samples; index++) {
|
||||||
|
const x = lower + index * step;
|
||||||
|
const y = evaluate(x);
|
||||||
|
const lastX = previousX;
|
||||||
|
const lastY = previousY;
|
||||||
|
previousX = x;
|
||||||
|
previousY = y;
|
||||||
|
if (y === null || lastY === null) continue;
|
||||||
|
// A sign change across a pole is not a root. Reject brackets where the
|
||||||
|
// function magnitude explodes — that is `tan`'s asymptote, not a
|
||||||
|
// crossing.
|
||||||
|
if (Math.sign(lastY) === Math.sign(y)) continue;
|
||||||
|
if (Math.abs(lastY) >= 1e6 || Math.abs(y) >= 1e6) continue;
|
||||||
|
|
||||||
|
let low = lastX;
|
||||||
|
let high = x;
|
||||||
|
for (let iteration = 0; iteration < 60; iteration++) {
|
||||||
|
const mid = (low + high) / 2;
|
||||||
|
const value = evaluate(mid);
|
||||||
|
if (value === null) break;
|
||||||
|
if (value === 0) {
|
||||||
|
low = mid;
|
||||||
|
high = mid;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
const lowValue = evaluate(low);
|
||||||
|
if (lowValue !== null && Math.sign(value) === Math.sign(lowValue)) {
|
||||||
|
low = mid;
|
||||||
|
} else {
|
||||||
|
high = mid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const root = (low + high) / 2;
|
||||||
|
// Verify the root rather than trusting the sign change.
|
||||||
|
//
|
||||||
|
// A sign change also happens across a pole — tan(x) flips from +∞ to −∞
|
||||||
|
// at π/2 — and bisection happily converges onto the asymptote. The
|
||||||
|
// magnitude guard above does not catch it, because a sample 0.0025 away
|
||||||
|
// from the pole is only ~400, nowhere near the cutoff. At a real root the
|
||||||
|
// residual is ~1e-15; at a pole it is enormous.
|
||||||
|
const residual = evaluate(root);
|
||||||
|
if (residual === null || Math.abs(residual) >= 1e-6) continue;
|
||||||
|
if (!roots.some((existing) => Math.abs(existing - root) < 1e-6)) roots.push(root);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keep the roots NEAREST ZERO, not the first twelve found.
|
||||||
|
//
|
||||||
|
// sin(x) = 0 has 64 roots in this window; scanning left to right and
|
||||||
|
// stopping at twelve returned everything between −97 and −63 and nothing
|
||||||
|
// near the origin, which is the opposite of what anyone asking
|
||||||
|
// "solve sin x = 0" wants to see.
|
||||||
|
const maximumRoots = 12;
|
||||||
|
if (roots.length > maximumRoots) {
|
||||||
|
roots = roots.sort((a, b) => Math.abs(a) - Math.abs(b)).slice(0, maximumRoots);
|
||||||
|
}
|
||||||
|
roots.sort((a, b) => a - b);
|
||||||
|
|
||||||
|
steps.add(
|
||||||
|
"Roots found",
|
||||||
|
difference,
|
||||||
|
roots.length === 0
|
||||||
|
? "No sign change was found between −100 and 100."
|
||||||
|
: "Searched between −100 and 100 for sign changes.",
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
kind: { kind: "roots", roots: roots.map((root) => num(fromDecimal(root))) },
|
||||||
|
variable,
|
||||||
|
steps: steps.steps,
|
||||||
|
restatement: original,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatApprox(value: number): string {
|
||||||
|
return describeNumber(real(value));
|
||||||
|
}
|
||||||
@@ -0,0 +1,323 @@
|
|||||||
|
// Symbolic antiderivatives. Not a Risch implementation — that is a
|
||||||
|
// research-grade algorithm and wildly out of proportion here. This is the
|
||||||
|
// standard table plus three structural rules (linearity, linear substitution,
|
||||||
|
// integration by parts), which is what actually covers a calculus course.
|
||||||
|
// Anything outside that returns null rather than a wrong answer, and the
|
||||||
|
// caller falls back to the numeric integrator, which always works.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
addExpr,
|
||||||
|
divideExpr,
|
||||||
|
fn,
|
||||||
|
int,
|
||||||
|
multiplyExpr,
|
||||||
|
negate,
|
||||||
|
num,
|
||||||
|
numberValue,
|
||||||
|
powerExpr,
|
||||||
|
subtractExpr,
|
||||||
|
variable as variableExpr,
|
||||||
|
variablesOf,
|
||||||
|
} from "./expression";
|
||||||
|
import {
|
||||||
|
type MathNumber,
|
||||||
|
add,
|
||||||
|
fromDecimal,
|
||||||
|
integer,
|
||||||
|
multiply,
|
||||||
|
numberEquals,
|
||||||
|
rational,
|
||||||
|
reciprocal,
|
||||||
|
} from "./math-number";
|
||||||
|
import { simplify } from "./simplifier";
|
||||||
|
import { differentiate, integrateNumeric } from "./derivative";
|
||||||
|
import { evaluateValue } from "./evaluator";
|
||||||
|
import { Polynomial } from "./polynomial";
|
||||||
|
import { isZero } from "./math-number";
|
||||||
|
|
||||||
|
/** Indefinite integral with respect to `variable`, without the constant. */
|
||||||
|
export function integrate(expression: MathExpression, variable: string): MathExpression | null {
|
||||||
|
const raw = attempt(simplify(expression), variable, 0);
|
||||||
|
if (!raw) return null;
|
||||||
|
return simplify(raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** With `+ C`, for display. */
|
||||||
|
export function integrateWithConstant(expression: MathExpression, variable: string): MathExpression | null {
|
||||||
|
const result = integrate(expression, variable);
|
||||||
|
return result ? addExpr([result, variableExpr("C")]) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function attempt(expression: MathExpression, variable: string, depth: number): MathExpression | null {
|
||||||
|
// Integration by parts can recurse; bound it so a bad pairing cannot loop
|
||||||
|
// forever.
|
||||||
|
if (depth >= 6) return null;
|
||||||
|
|
||||||
|
// Constant with respect to the variable: ∫c dx = cx
|
||||||
|
if (!variablesOf(expression).includes(variable)) {
|
||||||
|
return multiplyExpr([expression, variableExpr(variable)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (expression.type) {
|
||||||
|
case "variable":
|
||||||
|
if (expression.name === variable) {
|
||||||
|
return divideExpr(powerExpr(variableExpr(variable), int(2)), int(2));
|
||||||
|
}
|
||||||
|
// A variable other than the integration variable is already handled by
|
||||||
|
// the constant guard above; nothing reaches here.
|
||||||
|
return null;
|
||||||
|
|
||||||
|
case "negate": {
|
||||||
|
const inner = attempt(expression.inner, variable, depth);
|
||||||
|
return inner ? negate(inner) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "add": {
|
||||||
|
// Linearity. If any term is not integrable the whole thing is not.
|
||||||
|
const integrated: MathExpression[] = [];
|
||||||
|
for (const term of expression.terms) {
|
||||||
|
const part = attempt(term, variable, depth);
|
||||||
|
if (!part) return null;
|
||||||
|
integrated.push(part);
|
||||||
|
}
|
||||||
|
return addExpr(integrated);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "multiply":
|
||||||
|
return integrateProduct(expression.factors, variable, depth);
|
||||||
|
|
||||||
|
case "power":
|
||||||
|
return integratePower(expression.base, expression.exponent, variable);
|
||||||
|
|
||||||
|
case "function": {
|
||||||
|
const argument = expression.args[0];
|
||||||
|
if (!argument) return null;
|
||||||
|
return integrateFunction(expression.fn, argument, variable);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "number":
|
||||||
|
case "constant":
|
||||||
|
case "relation":
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Products
|
||||||
|
|
||||||
|
function integrateProduct(
|
||||||
|
factors: MathExpression[],
|
||||||
|
variable: string,
|
||||||
|
depth: number,
|
||||||
|
): MathExpression | null {
|
||||||
|
// Pull constants out front: ∫ c·f dx = c·∫f dx
|
||||||
|
const constants: MathExpression[] = [];
|
||||||
|
const variableFactors: MathExpression[] = [];
|
||||||
|
for (const factor of factors) {
|
||||||
|
if (variablesOf(factor).includes(variable)) {
|
||||||
|
variableFactors.push(factor);
|
||||||
|
} else {
|
||||||
|
constants.push(factor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (variableFactors.length === 0) {
|
||||||
|
return multiplyExpr([...factors, variableExpr(variable)]);
|
||||||
|
}
|
||||||
|
if (constants.length > 0) {
|
||||||
|
const inner = variableFactors.length === 1 ? variableFactors[0]! : multiplyExpr(variableFactors);
|
||||||
|
const integrated = attempt(inner, variable, depth);
|
||||||
|
if (!integrated) return null;
|
||||||
|
return multiplyExpr([...constants, integrated]);
|
||||||
|
}
|
||||||
|
if (variableFactors.length !== 2) return null;
|
||||||
|
return integrateByParts(variableFactors[0]!, variableFactors[1]!, variable, depth);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ∫u dv = uv − ∫v du.
|
||||||
|
*
|
||||||
|
* Picks `u` by the LIATE heuristic: whichever factor differentiates toward
|
||||||
|
* nothing goes in `u`. Getting this backwards turns a one-step integral into
|
||||||
|
* an infinite regress, which is why the depth bound above exists.
|
||||||
|
*/
|
||||||
|
function integrateByParts(
|
||||||
|
first: MathExpression,
|
||||||
|
second: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
depth: number,
|
||||||
|
): MathExpression | null {
|
||||||
|
const priority = (expression: MathExpression): number => {
|
||||||
|
if (expression.type === "function") {
|
||||||
|
switch (expression.fn) {
|
||||||
|
case "ln":
|
||||||
|
case "log10":
|
||||||
|
case "log2":
|
||||||
|
return 5;
|
||||||
|
case "asin":
|
||||||
|
case "acos":
|
||||||
|
case "atan":
|
||||||
|
return 4;
|
||||||
|
case "sin":
|
||||||
|
case "cos":
|
||||||
|
case "tan":
|
||||||
|
return 2;
|
||||||
|
case "exp":
|
||||||
|
return 1;
|
||||||
|
default:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (expression.type === "variable" || expression.type === "power") return 3;
|
||||||
|
return 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
const [u, dv] = priority(first) >= priority(second) ? [first, second] : [second, first];
|
||||||
|
|
||||||
|
const v = attempt(dv, variable, depth + 1);
|
||||||
|
if (!v) return null;
|
||||||
|
const du = differentiate(u, variable);
|
||||||
|
const remainder = simplify(multiplyExpr([v, du]));
|
||||||
|
const integratedRemainder = attempt(remainder, variable, depth + 1);
|
||||||
|
if (!integratedRemainder) return null;
|
||||||
|
return subtractExpr(multiplyExpr([u, v]), integratedRemainder);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Powers
|
||||||
|
|
||||||
|
function integratePower(
|
||||||
|
base: MathExpression,
|
||||||
|
exponent: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
): MathExpression | null {
|
||||||
|
const baseHasVariable = variablesOf(base).includes(variable);
|
||||||
|
const exponentHasVariable = variablesOf(exponent).includes(variable);
|
||||||
|
|
||||||
|
// Exponential: ∫a^x dx = a^x / ln a
|
||||||
|
if (!baseHasVariable && exponentHasVariable) {
|
||||||
|
const linear = linearForm(exponent, variable);
|
||||||
|
if (!linear) return null;
|
||||||
|
const antiderivative = divideExpr(powerExpr(base, exponent), fn("ln", [base]));
|
||||||
|
return divideExpr(antiderivative, num(linear.slope));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!baseHasVariable || exponentHasVariable) return null;
|
||||||
|
const power = numberValue(exponent);
|
||||||
|
if (!power) return null;
|
||||||
|
|
||||||
|
// Chain rule in reverse, but only for a LINEAR inner function. For a
|
||||||
|
// nonlinear inner function the substitution needs its own du, which this
|
||||||
|
// level of machinery cannot supply — returning null there is the
|
||||||
|
// difference between "no symbolic form" and a wrong one.
|
||||||
|
const linear = linearForm(base, variable);
|
||||||
|
if (!linear) return null;
|
||||||
|
|
||||||
|
// ∫(ax+b)^-1 dx = ln|ax+b| / a
|
||||||
|
if (numberEquals(power, integer(-1))) {
|
||||||
|
return divideExpr(fn("ln", [fn("abs", [base])]), num(linear.slope));
|
||||||
|
}
|
||||||
|
const raised = add(power, integer(1));
|
||||||
|
return divideExpr(powerExpr(base, num(raised)), num(multiply(raised, linear.slope)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Functions
|
||||||
|
|
||||||
|
function integrateFunction(
|
||||||
|
functionName: string,
|
||||||
|
argument: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
): MathExpression | null {
|
||||||
|
// Same restriction as powers: the inner function must be linear, or the
|
||||||
|
// substitution is not this simple.
|
||||||
|
const linear = linearForm(argument, variable);
|
||||||
|
if (!linear) return null;
|
||||||
|
const scale = num(reciprocal(linear.slope));
|
||||||
|
|
||||||
|
let antiderivative: MathExpression | null;
|
||||||
|
switch (functionName) {
|
||||||
|
case "sin":
|
||||||
|
antiderivative = negate(fn("cos", [argument]));
|
||||||
|
break;
|
||||||
|
case "cos":
|
||||||
|
antiderivative = fn("sin", [argument]);
|
||||||
|
break;
|
||||||
|
case "tan":
|
||||||
|
antiderivative = negate(fn("ln", [fn("abs", [fn("cos", [argument])])]));
|
||||||
|
break;
|
||||||
|
case "exp":
|
||||||
|
antiderivative = fn("exp", [argument]);
|
||||||
|
break;
|
||||||
|
case "sinh":
|
||||||
|
antiderivative = fn("cosh", [argument]);
|
||||||
|
break;
|
||||||
|
case "cosh":
|
||||||
|
antiderivative = fn("sinh", [argument]);
|
||||||
|
break;
|
||||||
|
case "ln":
|
||||||
|
// ∫ln(u) du = u·ln(u) − u
|
||||||
|
antiderivative = subtractExpr(multiplyExpr([argument, fn("ln", [argument])]), argument);
|
||||||
|
break;
|
||||||
|
case "sqrt":
|
||||||
|
// ∫√u du = (2/3)·u^(3/2)
|
||||||
|
antiderivative = multiplyExpr([num(rational(2, 3)), powerExpr(argument, num(rational(3, 2)))]);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
antiderivative = null;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (!antiderivative) return null;
|
||||||
|
return multiplyExpr([scale, antiderivative]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Definite
|
||||||
|
|
||||||
|
export type DefiniteResult =
|
||||||
|
/** Evaluated from an exact antiderivative — the fundamental theorem. */
|
||||||
|
| { kind: "exact"; value: MathNumber; antiderivative: MathExpression }
|
||||||
|
/** No symbolic form; the value came from adaptive Simpson. */
|
||||||
|
| { kind: "numeric"; value: number }
|
||||||
|
| { kind: "failed"; reason: string };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prefer the symbolic route so the answer can show its working, and fall
|
||||||
|
* back to numerics so the question always gets answered.
|
||||||
|
*/
|
||||||
|
export function definite(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
lower: number,
|
||||||
|
upper: number,
|
||||||
|
): DefiniteResult {
|
||||||
|
const antiderivative = integrate(expression, variable);
|
||||||
|
if (antiderivative) {
|
||||||
|
const atUpper = evaluateValue(antiderivative, { [variable]: upper });
|
||||||
|
const atLower = evaluateValue(antiderivative, { [variable]: lower });
|
||||||
|
if (atUpper !== null && atLower !== null && Number.isFinite(atUpper) && Number.isFinite(atLower)) {
|
||||||
|
return { kind: "exact", value: fromDecimal(atUpper - atLower), antiderivative };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const value = integrateNumeric(expression, variable, lower, upper);
|
||||||
|
if (value === null) {
|
||||||
|
return { kind: "failed", reason: "The function is undefined somewhere in that range" };
|
||||||
|
}
|
||||||
|
return { kind: "numeric", value };
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Linear form
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recognises `a·x + b`, which is the only inner function the substitution
|
||||||
|
* rules above can undo.
|
||||||
|
*/
|
||||||
|
export function linearForm(
|
||||||
|
expression: MathExpression,
|
||||||
|
variable: string,
|
||||||
|
): { slope: MathNumber; intercept: MathNumber } | null {
|
||||||
|
const polynomial = Polynomial.extract(expression, variable);
|
||||||
|
if (!polynomial || polynomial.degree !== 1 || isZero(polynomial.at(1))) return null;
|
||||||
|
return { slope: polynomial.at(1), intercept: polynomial.at(0) };
|
||||||
|
}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
// The glasses have no formula renderer and a 576-pixel-wide window, so every
|
||||||
|
// expression needs a compact ASCII form. Two things make this more than a
|
||||||
|
// tree walk. First, the internal representation is deliberately uniform —
|
||||||
|
// division is `a · b^-1`, subtraction is `a + (−b)` — and printing that
|
||||||
|
// literally would produce `2*x^-1` where a reader expects `2/x`, so the
|
||||||
|
// renderer detects those patterns and un-normalises them. Second, precedence
|
||||||
|
// decides bracketing: too few brackets is wrong, too many is unreadable.
|
||||||
|
|
||||||
|
import { type MathExpression, numberValue } from "./expression";
|
||||||
|
import { type MathNumber, describeNumber, isNegative, isOne, negated } from "./math-number";
|
||||||
|
|
||||||
|
const PRECEDENCE = {
|
||||||
|
relation: 1,
|
||||||
|
sum: 2,
|
||||||
|
product: 3,
|
||||||
|
power: 4,
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export function plain(expression: MathExpression): string {
|
||||||
|
return render(expression, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderNumber(value: MathNumber): string {
|
||||||
|
return describeNumber(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function render(expression: MathExpression, parentPrecedence: number): string {
|
||||||
|
switch (expression.type) {
|
||||||
|
case "number": {
|
||||||
|
const text = describeNumber(expression.value);
|
||||||
|
return wrap(text, isNegative(expression.value) && parentPrecedence >= PRECEDENCE.product);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "variable":
|
||||||
|
return expression.name;
|
||||||
|
|
||||||
|
case "constant":
|
||||||
|
return expression.constant;
|
||||||
|
|
||||||
|
case "negate":
|
||||||
|
return wrap("-" + render(expression.inner, PRECEDENCE.product), parentPrecedence > PRECEDENCE.sum);
|
||||||
|
|
||||||
|
case "add": {
|
||||||
|
let output = "";
|
||||||
|
for (let index = 0; index < expression.terms.length; index++) {
|
||||||
|
const term = expression.terms[index]!;
|
||||||
|
if (term.type === "negate") {
|
||||||
|
output += index === 0 ? "-" : " - ";
|
||||||
|
output += render(term.inner, PRECEDENCE.sum);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const value = numberValue(term);
|
||||||
|
if (value && isNegative(value) && index > 0) {
|
||||||
|
output += " - " + describeNumber(negated(value));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (index > 0) output += " + ";
|
||||||
|
output += render(term, PRECEDENCE.sum);
|
||||||
|
}
|
||||||
|
return wrap(output, parentPrecedence > PRECEDENCE.sum);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "multiply": {
|
||||||
|
const numerator: MathExpression[] = [];
|
||||||
|
const denominator: MathExpression[] = [];
|
||||||
|
for (const factor of expression.factors) {
|
||||||
|
if (factor.type === "power") {
|
||||||
|
const power = numberValue(factor.exponent);
|
||||||
|
if (power && isNegative(power)) {
|
||||||
|
const positive = negated(power);
|
||||||
|
denominator.push(
|
||||||
|
isOne(positive) ? factor.base : { type: "power", base: factor.base, exponent: { type: "number", value: positive } },
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
numerator.push(factor);
|
||||||
|
}
|
||||||
|
const top =
|
||||||
|
numerator.length === 0
|
||||||
|
? "1"
|
||||||
|
: numerator.map((factor) => render(factor, PRECEDENCE.product)).join("*");
|
||||||
|
if (denominator.length === 0) {
|
||||||
|
return wrap(top, parentPrecedence > PRECEDENCE.product);
|
||||||
|
}
|
||||||
|
const bottom = denominator.map((factor) => render(factor, PRECEDENCE.power)).join("*");
|
||||||
|
return wrap(`${top}/${bottom}`, parentPrecedence > PRECEDENCE.product);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "power": {
|
||||||
|
const exponentValue = numberValue(expression.exponent);
|
||||||
|
if (exponentValue && exponentValue.kind === "rational" && exponentValue.n === 1 && exponentValue.d === 2) {
|
||||||
|
return `sqrt(${render(expression.base, 0)})`;
|
||||||
|
}
|
||||||
|
// A bare negative power is a reciprocal. Printing `x^(-1)` where a
|
||||||
|
// reader expects `1/x` is the plain-text twin of the fraction
|
||||||
|
// un-normalisation above.
|
||||||
|
if (exponentValue && isNegative(exponentValue)) {
|
||||||
|
const positive = negated(exponentValue);
|
||||||
|
const inner = isOne(positive)
|
||||||
|
? render(expression.base, PRECEDENCE.power)
|
||||||
|
: `${render(expression.base, PRECEDENCE.power + 1)}^${describeNumber(positive)}`;
|
||||||
|
return wrap(`1/${inner}`, parentPrecedence > PRECEDENCE.product);
|
||||||
|
}
|
||||||
|
const body =
|
||||||
|
`${render(expression.base, PRECEDENCE.power + 1)}` +
|
||||||
|
`^${render(expression.exponent, PRECEDENCE.power + 1)}`;
|
||||||
|
return wrap(body, parentPrecedence > PRECEDENCE.power);
|
||||||
|
}
|
||||||
|
|
||||||
|
case "function": {
|
||||||
|
const inner = expression.args.map((argument) => render(argument, 0)).join(", ");
|
||||||
|
if (expression.fn === "factorial") return `(${inner})!`;
|
||||||
|
if (expression.fn === "abs") return `|${inner}|`;
|
||||||
|
return `${expression.fn}(${inner})`;
|
||||||
|
}
|
||||||
|
|
||||||
|
case "relation":
|
||||||
|
return (
|
||||||
|
`${render(expression.lhs, PRECEDENCE.relation)} ` +
|
||||||
|
`${expression.relation} ` +
|
||||||
|
`${render(expression.rhs, PRECEDENCE.relation)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function wrap(body: string, condition: boolean): string {
|
||||||
|
return condition ? `(${body})` : body;
|
||||||
|
}
|
||||||
@@ -0,0 +1,172 @@
|
|||||||
|
// Trig equation solving and the identity sheet. The distinguishing feature
|
||||||
|
// versus the generic numeric root finder: a trig equation has infinitely many
|
||||||
|
// solutions, and the right answer is the FAMILY (`x = π/6 + 2πn`), not the
|
||||||
|
// twelve roots that happen to fall in the search window. Reporting a finite
|
||||||
|
// list for `sin x = 1/2` is the standard wrong answer in this topic.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type MathExpression,
|
||||||
|
ZERO,
|
||||||
|
constant,
|
||||||
|
divideExpr,
|
||||||
|
int,
|
||||||
|
multiplyExpr,
|
||||||
|
} from "./expression";
|
||||||
|
import { describeNumber, fromDecimal } from "./math-number";
|
||||||
|
import { plain } from "./text-renderer";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Solutions
|
||||||
|
|
||||||
|
/** One family of solutions: `base + period·n`. */
|
||||||
|
export type SolutionFamily = {
|
||||||
|
base: number;
|
||||||
|
period: number;
|
||||||
|
/** Exact form when the base is a recognisable multiple of π. */
|
||||||
|
baseExpression: MathExpression | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function familyValues(family: SolutionFamily, lower: number, upper: number): number[] {
|
||||||
|
if (family.period <= 0) {
|
||||||
|
return family.base >= lower && family.base <= upper ? [family.base] : [];
|
||||||
|
}
|
||||||
|
const results: number[] = [];
|
||||||
|
let n = Math.floor((lower - family.base) / family.period);
|
||||||
|
for (;;) {
|
||||||
|
const value = family.base + n * family.period;
|
||||||
|
if (value > upper) break;
|
||||||
|
if (value >= lower) results.push(value);
|
||||||
|
n += 1;
|
||||||
|
if (results.length > 1000) break;
|
||||||
|
}
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function familyText(family: SolutionFamily): string {
|
||||||
|
const baseText = family.baseExpression
|
||||||
|
? plain(family.baseExpression)
|
||||||
|
: describeNumber(fromDecimal(family.base));
|
||||||
|
// The separator is load-bearing: "2*pi" run straight into the index reads
|
||||||
|
// as "2*pin", a different and nonsensical expression to anyone scanning it
|
||||||
|
// on the lens.
|
||||||
|
const periodText = describePi(family.period);
|
||||||
|
return `${baseText} + ${periodText}·n`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type SolutionSet =
|
||||||
|
| { kind: "families"; families: SolutionFamily[] }
|
||||||
|
| { kind: "all" }
|
||||||
|
| { kind: "none" };
|
||||||
|
|
||||||
|
/** Solve `f(x) = value` for sin, cos, or tan. */
|
||||||
|
export function solveTrig(functionName: "sin" | "cos" | "tan", value: number): SolutionSet {
|
||||||
|
switch (functionName) {
|
||||||
|
case "sin": {
|
||||||
|
if (Math.abs(value) > 1) return { kind: "none" };
|
||||||
|
const principal = Math.asin(value);
|
||||||
|
// sin has two families per period, which collapse to one when the value
|
||||||
|
// is ±1 (the turning points).
|
||||||
|
if (Math.abs(Math.abs(value) - 1) < 1e-12) {
|
||||||
|
return { kind: "families", families: [family(principal, 2 * Math.PI)] };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
kind: "families",
|
||||||
|
families: [family(principal, 2 * Math.PI), family(Math.PI - principal, 2 * Math.PI)],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
case "cos": {
|
||||||
|
if (Math.abs(value) > 1) return { kind: "none" };
|
||||||
|
const principal = Math.acos(value);
|
||||||
|
if (Math.abs(principal) < 1e-12 || Math.abs(principal - Math.PI) < 1e-12) {
|
||||||
|
return { kind: "families", families: [family(principal, 2 * Math.PI)] };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
kind: "families",
|
||||||
|
families: [family(principal, 2 * Math.PI), family(-principal, 2 * Math.PI)],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
case "tan":
|
||||||
|
// tan repeats every π, not 2π — one family covers everything.
|
||||||
|
return { kind: "families", families: [family(Math.atan(value), Math.PI)] };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function family(base: number, period: number): SolutionFamily {
|
||||||
|
return { base, period, baseExpression: piMultiple(base) };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recognise a value as an exact rational multiple of π, so a solution reads
|
||||||
|
* `π/6` instead of `0.5235987755982988`.
|
||||||
|
*/
|
||||||
|
export function piMultiple(value: number): MathExpression | null {
|
||||||
|
if (!Number.isFinite(value)) return null;
|
||||||
|
if (Math.abs(value) < 1e-12) return ZERO;
|
||||||
|
const ratio = value / Math.PI;
|
||||||
|
for (const denominator of [1, 2, 3, 4, 6, 8, 12]) {
|
||||||
|
const scaled = ratio * denominator;
|
||||||
|
const rounded = Math.round(scaled);
|
||||||
|
if (Math.abs(scaled - rounded) >= 1e-9 || Math.abs(rounded) >= 1e6) continue;
|
||||||
|
const numerator = rounded;
|
||||||
|
if (numerator === 0) return ZERO;
|
||||||
|
if (numerator === 1 && denominator === 1) return constant("pi");
|
||||||
|
// pi/6, not (1/6)*pi — a unit numerator belongs in the fraction, which is
|
||||||
|
// how every textbook writes these solution families.
|
||||||
|
if (numerator === 1) return divideExpr(constant("pi"), int(denominator));
|
||||||
|
if (denominator === 1) return multiplyExpr([int(numerator), constant("pi")]);
|
||||||
|
return divideExpr(multiplyExpr([int(numerator), constant("pi")]), int(denominator));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function describePi(value: number): string {
|
||||||
|
const multiple = piMultiple(value);
|
||||||
|
return multiple ? plain(multiple) : describeNumber(fromDecimal(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Identities
|
||||||
|
|
||||||
|
export type TrigIdentity = {
|
||||||
|
name: string;
|
||||||
|
plain: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The identity sheet, for the "explain it" surface and for a wearer who
|
||||||
|
* wants the reference on the lens.
|
||||||
|
*/
|
||||||
|
export const TRIG_IDENTITIES: readonly TrigIdentity[] = [
|
||||||
|
{ name: "Pythagorean", plain: "sin²θ + cos²θ = 1" },
|
||||||
|
{ name: "Pythagorean (tan)", plain: "1 + tan²θ = sec²θ" },
|
||||||
|
{ name: "Sine sum", plain: "sin(a ± b) = sin a cos b ± cos a sin b" },
|
||||||
|
{ name: "Cosine sum", plain: "cos(a ± b) = cos a cos b ∓ sin a sin b" },
|
||||||
|
{ name: "Tangent sum", plain: "tan(a ± b) = (tan a ± tan b) / (1 ∓ tan a tan b)" },
|
||||||
|
{ name: "Double angle (sine)", plain: "sin 2θ = 2 sin θ cos θ" },
|
||||||
|
{ name: "Double angle (cosine)", plain: "cos 2θ = cos²θ − sin²θ = 2cos²θ − 1" },
|
||||||
|
{ name: "Half angle", plain: "sin²θ = (1 − cos 2θ)/2" },
|
||||||
|
{ name: "Law of sines", plain: "a/sin A = b/sin B = c/sin C" },
|
||||||
|
{ name: "Law of cosines", plain: "c² = a² + b² − 2ab cos C" },
|
||||||
|
];
|
||||||
|
|
||||||
|
export function identityMatching(query: string): TrigIdentity | null {
|
||||||
|
const needle = query.toLowerCase();
|
||||||
|
return (
|
||||||
|
TRIG_IDENTITIES.find((identity) => identity.name.toLowerCase().includes(needle)) ??
|
||||||
|
TRIG_IDENTITIES.find((identity) => needle.includes(identity.name.toLowerCase())) ??
|
||||||
|
null
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Conversion
|
||||||
|
|
||||||
|
export function degreesFromRadians(radians: number): number {
|
||||||
|
return (radians * 180) / Math.PI;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function radiansFromDegrees(degrees: number): number {
|
||||||
|
return (degrees * Math.PI) / 180;
|
||||||
|
}
|
||||||
@@ -0,0 +1,292 @@
|
|||||||
|
// Workload estimation and routing for heavy maths requests.
|
||||||
|
//
|
||||||
|
// The router collapses to two honest options: the fast on-device answer, and an
|
||||||
|
// explicit, cancellable long run on the phone that the wearer opts into.
|
||||||
|
// The estimate is the whole point — every workload carries a closed-form
|
||||||
|
// cost model so the offer can price the wait before doing any work.
|
||||||
|
|
||||||
|
import {
|
||||||
|
type ComputeCancellation,
|
||||||
|
type ComputeProgress,
|
||||||
|
type MathConstantName,
|
||||||
|
MAXIMUM_COMPUTED_DIGITS,
|
||||||
|
MAXIMUM_FEASIBLE_DIGITS,
|
||||||
|
NEVER_CANCELLED,
|
||||||
|
constantSpokenName,
|
||||||
|
deepFractionalDigits,
|
||||||
|
} from "./constant-digits";
|
||||||
|
import {
|
||||||
|
type DigitCountResult,
|
||||||
|
type DigitSearchOutcome,
|
||||||
|
countInExpansion,
|
||||||
|
locateDigits,
|
||||||
|
} from "./digit-search";
|
||||||
|
import { formatInt } from "./math-number";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Durations
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Turns a seconds estimate into something worth reading out. Deliberately
|
||||||
|
* coarse: the cost model behind these numbers is accurate to an order of
|
||||||
|
* magnitude, not to the second, so "about 247 seconds" would be a precision
|
||||||
|
* the estimate does not have.
|
||||||
|
*/
|
||||||
|
export function describeDuration(seconds: number): string {
|
||||||
|
if (!Number.isFinite(seconds) || seconds <= 0) return "no time at all";
|
||||||
|
if (seconds < 1) return "under a second";
|
||||||
|
if (seconds < 10) return `about ${Math.round(seconds)} seconds`;
|
||||||
|
if (seconds < 60) return `about ${roundedTo(seconds, 5)} seconds`;
|
||||||
|
|
||||||
|
const minutes = seconds / 60;
|
||||||
|
if (minutes < 2) return "about a minute and a half";
|
||||||
|
if (minutes < 60) return `about ${Math.round(minutes)} minutes`;
|
||||||
|
|
||||||
|
const hours = minutes / 60;
|
||||||
|
if (hours < 2) return "about an hour and a half";
|
||||||
|
if (hours < 24) return `about ${Math.round(hours)} hours`;
|
||||||
|
|
||||||
|
const days = hours / 24;
|
||||||
|
if (days < 365) return `about ${Math.round(days)} days`;
|
||||||
|
const years = days / 365;
|
||||||
|
return years < 2 ? "well over a year" : `about ${Math.round(years)} years`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Short form for the lens, where there is no room for a sentence. */
|
||||||
|
export function compactDuration(seconds: number): string {
|
||||||
|
if (!Number.isFinite(seconds) || seconds <= 0) return "0s";
|
||||||
|
if (seconds < 60) return `${Math.round(seconds)}s`;
|
||||||
|
if (seconds < 3600) return `${Math.round(seconds / 60)}m`;
|
||||||
|
if (seconds < 86_400) return `${Math.round(seconds / 3600)}h`;
|
||||||
|
return `${Math.round(seconds / 86_400)}d`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function roundedTo(value: number, step: number): number {
|
||||||
|
return Math.max(step, Math.round(value / step) * step);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Workloads
|
||||||
|
|
||||||
|
export type MathWorkload =
|
||||||
|
/** Generate the decimal expansion of a constant. */
|
||||||
|
| { kind: "constantDigits"; constant: MathConstantName; count: number }
|
||||||
|
/** Find a digit run inside a constant's expansion. */
|
||||||
|
| { kind: "digitSearch"; constant: MathConstantName; pattern: string; occurrence: number }
|
||||||
|
/** Count a digit run across the deepest available expansion. */
|
||||||
|
| { kind: "digitCount"; constant: MathConstantName; pattern: string };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rough seconds on the phone. Machin with scalar big arithmetic is O(n²);
|
||||||
|
* measured with V8 BigInt: 10,000 digits ≈ 0.06 s on an M-class core, so
|
||||||
|
* ~0.35 s per (n/10k)² on a device-class core. It does not need to be
|
||||||
|
* precise, only right about the ORDER OF MAGNITUDE, because the routing
|
||||||
|
* threshold and the offers are separated by factors of thousands — and at
|
||||||
|
* this value an hour reaches about a million digits, which is where any
|
||||||
|
* five-digit run and most six-digit ones live.
|
||||||
|
*/
|
||||||
|
const SECONDS_PER_TEN_K_SQUARED = 0.35;
|
||||||
|
|
||||||
|
export function estimatedLocalSeconds(workload: MathWorkload): number {
|
||||||
|
switch (workload.kind) {
|
||||||
|
case "constantDigits": {
|
||||||
|
const n = Math.max(workload.count, 1);
|
||||||
|
return SECONDS_PER_TEN_K_SQUARED * (n / 10_000) * (n / 10_000);
|
||||||
|
}
|
||||||
|
case "digitSearch":
|
||||||
|
// Dominated by generating enough digits to have a hope of finding the
|
||||||
|
// run: a k-digit pattern first appears around 10^k places.
|
||||||
|
return estimatedLocalSeconds({
|
||||||
|
kind: "constantDigits",
|
||||||
|
constant: workload.constant,
|
||||||
|
count: expectedDepth(workload.pattern.length),
|
||||||
|
});
|
||||||
|
case "digitCount":
|
||||||
|
return estimatedLocalSeconds({
|
||||||
|
kind: "constantDigits",
|
||||||
|
constant: workload.constant,
|
||||||
|
count: expectedDepth(workload.pattern.length),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many decimal places the workload would have to reach to answer
|
||||||
|
* properly, as opposed to however few it settled for.
|
||||||
|
*/
|
||||||
|
export function requiredDepth(workload: MathWorkload): number {
|
||||||
|
switch (workload.kind) {
|
||||||
|
case "constantDigits":
|
||||||
|
return Math.max(workload.count, 1);
|
||||||
|
case "digitSearch":
|
||||||
|
// The n-th occurrence sits roughly n× as deep as the first.
|
||||||
|
return expectedDepth(workload.pattern.length) * Math.max(workload.occurrence, 1);
|
||||||
|
case "digitCount":
|
||||||
|
return expectedDepth(workload.pattern.length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Roughly where a random run of `length` digits first appears. */
|
||||||
|
export function expectedDepth(patternLength: number): number {
|
||||||
|
if (patternLength <= 0) return 1_000;
|
||||||
|
// Cap so the estimator does not overflow on a silly pattern.
|
||||||
|
const bounded = Math.min(patternLength, 12);
|
||||||
|
return Math.max(Math.pow(10, bounded), 1_000);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function describeWorkload(workload: MathWorkload): string {
|
||||||
|
switch (workload.kind) {
|
||||||
|
case "constantDigits":
|
||||||
|
return `${formatInt(workload.count)} digits of ${constantSpokenName(workload.constant)}`;
|
||||||
|
case "digitSearch":
|
||||||
|
return `searching ${constantSpokenName(workload.constant)} for ${workload.pattern}`;
|
||||||
|
case "digitCount":
|
||||||
|
return `counting ${workload.pattern} in ${constantSpokenName(workload.constant)}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Offers
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An offer to grind the full-depth answer out on the phone. Produced when a
|
||||||
|
* question needs a deeper expansion than the fast path holds. It is a value,
|
||||||
|
* not an action: nothing runs until the caller accepts it, because the whole
|
||||||
|
* point is that the wearer decides whether the wait is affordable right now.
|
||||||
|
*/
|
||||||
|
export type LongRunOffer = {
|
||||||
|
/** What would be run. */
|
||||||
|
workload: MathWorkload;
|
||||||
|
/** The phone's own estimate for the full-depth run. */
|
||||||
|
estimatedSeconds: number;
|
||||||
|
/** Why the fast path could not settle it. */
|
||||||
|
reason: string;
|
||||||
|
/** How deep the run would go — digits, for the expansion workloads. */
|
||||||
|
depth: number;
|
||||||
|
/**
|
||||||
|
* What was already answered without waiting, if anything. A shallow search
|
||||||
|
* still ran, so the offer is "look further", not "look at all".
|
||||||
|
*/
|
||||||
|
shallowAnswerDescription: string | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The sentence the answer view shows. */
|
||||||
|
export function offerPrompt(offer: LongRunOffer): string {
|
||||||
|
return (
|
||||||
|
`${offer.reason}. This phone can keep going to ${formatInt(offer.depth)} digits — ` +
|
||||||
|
`${describeDuration(offer.estimatedSeconds)}. Run it anyway?`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Two short rows for the lens. */
|
||||||
|
export function offerGlassesPrompt(offer: LongRunOffer): string {
|
||||||
|
return `Keep going? ${compactDuration(offer.estimatedSeconds)}\n${formatInt(offer.depth)} digits on phone`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Progress from a long local run, so a four-minute grind is not a dead screen. */
|
||||||
|
export type LongRunProgress = {
|
||||||
|
/** 0…1, or null when the phase cannot estimate itself. */
|
||||||
|
fraction: number | null;
|
||||||
|
/** What it is doing right now. */
|
||||||
|
stage: string;
|
||||||
|
/** Seconds elapsed so far. */
|
||||||
|
elapsedSeconds: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function progressText(progress: LongRunProgress): string {
|
||||||
|
if (progress.fraction === null) return progress.stage;
|
||||||
|
return `${Math.round(progress.fraction * 100)}% ${progress.stage}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The longest run the phone will even OFFER to attempt once the wearer has
|
||||||
|
* said they will wait. An hour reaches most five- and six-digit runs under
|
||||||
|
* the cost model. Past it the offer is withheld rather than shown: proposing
|
||||||
|
* a multi-hour grind that still might not answer the question is worse than
|
||||||
|
* plainly saying this device cannot settle it.
|
||||||
|
*/
|
||||||
|
export const LONG_RUN_CEILING_SECONDS = 3600;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build the offer, or decline to make one. Withheld in two cases, both
|
||||||
|
* because the wait would not buy an answer: the depth needed exceeds what
|
||||||
|
* the phone can hold, or the run would take longer than the ceiling.
|
||||||
|
*/
|
||||||
|
export function longRunOffer(
|
||||||
|
workload: MathWorkload,
|
||||||
|
reason: string,
|
||||||
|
shallow: string | null = null,
|
||||||
|
): LongRunOffer | null {
|
||||||
|
const depth = requiredDepth(workload);
|
||||||
|
if (depth <= MAXIMUM_COMPUTED_DIGITS) return null;
|
||||||
|
if (depth > MAXIMUM_FEASIBLE_DIGITS) return null;
|
||||||
|
|
||||||
|
const estimate = estimatedLocalSeconds({
|
||||||
|
kind: "constantDigits",
|
||||||
|
constant: workload.constant,
|
||||||
|
count: depth,
|
||||||
|
});
|
||||||
|
if (estimate > LONG_RUN_CEILING_SECONDS) return null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
workload,
|
||||||
|
estimatedSeconds: estimate,
|
||||||
|
reason,
|
||||||
|
depth,
|
||||||
|
shallowAnswerDescription: shallow,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Accepted runs
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run the search at full depth on the phone. Only called once the wearer has
|
||||||
|
* accepted the offer's stated wait. Async and chunked — the generators yield
|
||||||
|
* to the event loop, and the cancellation closure is checked every term.
|
||||||
|
*/
|
||||||
|
export async function runAcceptedSearch(
|
||||||
|
offer: LongRunOffer,
|
||||||
|
cancellation: ComputeCancellation = NEVER_CANCELLED,
|
||||||
|
progress: ComputeProgress | null = null,
|
||||||
|
): Promise<DigitSearchOutcome> {
|
||||||
|
if (offer.workload.kind !== "digitSearch") {
|
||||||
|
return { kind: "notFound", searchedDigits: 0 };
|
||||||
|
}
|
||||||
|
const expansion = await deepFractionalDigits(
|
||||||
|
offer.workload.constant,
|
||||||
|
offer.depth,
|
||||||
|
cancellation,
|
||||||
|
progress,
|
||||||
|
);
|
||||||
|
if (!expansion) return { kind: "notFound", searchedDigits: 0 };
|
||||||
|
return locateDigits(offer.workload.pattern, expansion, offer.workload.occurrence);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Generate the accepted depth and count overlapping occurrences there. */
|
||||||
|
export async function runAcceptedCount(
|
||||||
|
offer: LongRunOffer,
|
||||||
|
cancellation: ComputeCancellation = NEVER_CANCELLED,
|
||||||
|
progress: ComputeProgress | null = null,
|
||||||
|
): Promise<DigitCountResult> {
|
||||||
|
if (offer.workload.kind !== "digitCount") {
|
||||||
|
return { occurrences: 0, searchedDigits: 0 };
|
||||||
|
}
|
||||||
|
const expansion = await deepFractionalDigits(
|
||||||
|
offer.workload.constant,
|
||||||
|
offer.depth,
|
||||||
|
cancellation,
|
||||||
|
progress,
|
||||||
|
);
|
||||||
|
if (!expansion) return { occurrences: 0, searchedDigits: 0 };
|
||||||
|
return countInExpansion(offer.workload.pattern, expansion);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Generate the digits at full depth, once the offer has been accepted. */
|
||||||
|
export async function runAcceptedDigits(
|
||||||
|
offer: LongRunOffer,
|
||||||
|
cancellation: ComputeCancellation = NEVER_CANCELLED,
|
||||||
|
progress: ComputeProgress | null = null,
|
||||||
|
): Promise<string | null> {
|
||||||
|
return deepFractionalDigits(offer.workload.constant, offer.depth, cancellation, progress);
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { ensureCalendarPermission, hasCalendarPermission } from "../../g2/android-permissions";
|
import { ensureCalendarPermission, hasCalendarPermission } from "../../g2/android-permissions";
|
||||||
import { invalidateCalendarCache } from "../../native/calendar";
|
import { invalidateCalendarCache } from "../../native/calendar";
|
||||||
|
import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer";
|
||||||
import { CalendarLayer } from "./calendar";
|
import { CalendarLayer } from "./calendar";
|
||||||
|
import { renderCalendarDateIcon } from "./calendar-icon";
|
||||||
import {
|
import {
|
||||||
createInProcessWindow,
|
createInProcessWindow,
|
||||||
YieldAtRootLayer,
|
YieldAtRootLayer,
|
||||||
@@ -39,6 +41,7 @@ export function createCalendarAppWindow(options: InProcessAppOptions): InProcess
|
|||||||
title: "Calendar",
|
title: "Calendar",
|
||||||
iconLetter: "Ca",
|
iconLetter: "Ca",
|
||||||
icon: "calendar",
|
icon: "calendar",
|
||||||
|
drawIcon: makeImageWindowIcon(renderCalendarDateIcon, windowIcon("calendar", "Ca")),
|
||||||
closeable: true,
|
closeable: true,
|
||||||
actions: options.actions,
|
actions: options.actions,
|
||||||
baseLayer: new YieldAtRootLayer(new CalendarLayer(requestPermission)),
|
baseLayer: new YieldAtRootLayer(new CalendarLayer(requestPermission)),
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import { type GrayImage } from "../../graphics/image";
|
||||||
|
import { ICON_SVGS, renderSvgIcon } from "../../graphics/icons";
|
||||||
|
import { ensurePreinstalledFonts, installedFontPath } from "../../graphics/installed-fonts";
|
||||||
|
import { TtfFont } from "../../graphics/ttf-font";
|
||||||
|
|
||||||
|
// The calendar icon minus its divider line, freeing the whole box for the
|
||||||
|
// date digits. Derived from the shared SVG so the outline stays in sync.
|
||||||
|
const DIVIDER = '<path d="M3 10h18"/>';
|
||||||
|
const CALENDAR_BLANK_SVG = ICON_SVGS.calendar.replace(DIVIDER, "");
|
||||||
|
|
||||||
|
// One entry per requested size (launcher 44, sidebar 32/28); replaced when the
|
||||||
|
// day rolls over. A fresh image object per (size, day) keeps downstream
|
||||||
|
// per-object caches (texture cache, the sidebar's inverted-icon memo) correct.
|
||||||
|
const cache = new Map<number, { day: number; image: GrayImage }>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Digit font: bundled Roboto scaled to the icon (not the user-selected UI
|
||||||
|
* font, so the digits always fit the icon's box). Loaded once per icon size.
|
||||||
|
*/
|
||||||
|
const digitFonts = new Map<number, TtfFont | null>();
|
||||||
|
function loadDigitFont(size: number): TtfFont | null {
|
||||||
|
let font = digitFonts.get(size);
|
||||||
|
if (font === undefined) {
|
||||||
|
ensurePreinstalledFonts(); // the icon can render before any font picker use
|
||||||
|
font = TtfFont.load(installedFontPath("Roboto-Regular.ttf"), Math.round(size / 2));
|
||||||
|
digitFonts.set(size, font);
|
||||||
|
}
|
||||||
|
return font;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The calendar icon with today's day-of-month drawn in its body, like a phone
|
||||||
|
* calendar app icon.
|
||||||
|
*/
|
||||||
|
export function renderCalendarDateIcon(size: number): GrayImage | null {
|
||||||
|
const day = new Date().getDate();
|
||||||
|
const cached = cache.get(size);
|
||||||
|
if (cached && cached.day === day) return cached.image;
|
||||||
|
const base = renderSvgIcon("calendar-blank", CALENDAR_BLANK_SVG, size);
|
||||||
|
if (!base) return null;
|
||||||
|
// Without the digits the divider-less icon reads as broken; a null return
|
||||||
|
// gets both call sites' stock-calendar fallback instead.
|
||||||
|
const font = loadDigitFont(size);
|
||||||
|
if (!font) return null;
|
||||||
|
const image = base.clone();
|
||||||
|
const text = String(day);
|
||||||
|
// Center in the box interior (viewBox y 5..21 of 24, inside the stroke),
|
||||||
|
// nudged down so the digits sit clear of the top-edge hanging tabs.
|
||||||
|
const x = Math.round((size - font.measureText(text)) / 2);
|
||||||
|
const y = Math.round((size * 13.5) / 24 - font.lineHeight / 2);
|
||||||
|
image.drawText(font, x, y, text, 255);
|
||||||
|
image.bakeDeferredDrawsInPlace();
|
||||||
|
cache.set(size, { day, image });
|
||||||
|
return image;
|
||||||
|
}
|
||||||
@@ -4,9 +4,9 @@ import { wrapText, truncateText } from "../../graphics/textwrap";
|
|||||||
import { clamp } from "../../util/numeric-util";
|
import { clamp } from "../../util/numeric-util";
|
||||||
import { readUpcomingEvents, type CalendarEvent } from "../../native/calendar";
|
import { readUpcomingEvents, type CalendarEvent } from "../../native/calendar";
|
||||||
import { timeFormatSetting } from "../../ui/dashboard-settings";
|
import { timeFormatSetting } from "../../ui/dashboard-settings";
|
||||||
import { GESTURE_CLICK } from "../../ui/gestures";
|
import { GESTURE_CLICK, type InputEvent } from "../../ui/gestures";
|
||||||
import { hasCalendarPermission } from "../../g2/android-permissions";
|
import { hasCalendarPermission } from "../../g2/android-permissions";
|
||||||
import { type DashboardInputEvent, type Layer, type LayerContext } from "../../ui/layers";
|
import { type Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { lineStep } from "../../ui/metrics";
|
import { lineStep } from "../../ui/metrics";
|
||||||
|
|
||||||
// Title position, shared with the other list apps (terminal, notifications).
|
// Title position, shared with the other list apps (terminal, notifications).
|
||||||
@@ -85,7 +85,7 @@ export class CalendarLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent): void {
|
handleInput(event: InputEvent): void {
|
||||||
if (!hasCalendarPermission()) {
|
if (!hasCalendarPermission()) {
|
||||||
// Any tap on the prompt re-triggers the phone-side permission request.
|
// Any tap on the prompt re-triggers the phone-side permission request.
|
||||||
if (event.type === "click") this.requestPermission();
|
if (event.type === "click") this.requestPermission();
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import { type AppDefinition } from "../app-definition";
|
import { type AppDefinition } from "../app-definition";
|
||||||
import { CALENDAR_SURFACE_ID, CALENDAR_WINDOW_ID, createCalendarAppWindow } from "./calendar-app";
|
import { CALENDAR_SURFACE_ID, CALENDAR_WINDOW_ID, createCalendarAppWindow } from "./calendar-app";
|
||||||
|
import { renderCalendarDateIcon } from "./calendar-icon";
|
||||||
|
|
||||||
const calendarApp: AppDefinition = {
|
const calendarApp: AppDefinition = {
|
||||||
appId: "calendar",
|
appId: "calendar",
|
||||||
title: "Calendar",
|
title: "Calendar",
|
||||||
icon: "calendar",
|
icon: "calendar",
|
||||||
|
renderIcon: renderCalendarDateIcon,
|
||||||
launch: (ctx) => ctx.launchInProcessApp(CALENDAR_WINDOW_ID, CALENDAR_SURFACE_ID, createCalendarAppWindow),
|
launch: (ctx) => ctx.launchInProcessApp(CALENDAR_WINDOW_ID, CALENDAR_SURFACE_ID, createCalendarAppWindow),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { getDefaultMediumFont, getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultMediumFont, getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { wrapText } from "../../graphics/textwrap";
|
import { wrapText } from "../../graphics/textwrap";
|
||||||
import { type DashboardInputEvent, type Layer, type LayerContext } from "../../ui/layers";
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { type Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { lineStep } from "../../ui/metrics";
|
import { lineStep } from "../../ui/metrics";
|
||||||
import { screenCenterInViewportX } from "../../ui/shell/geometry";
|
import { screenCenterInViewportX } from "../../ui/shell/geometry";
|
||||||
import {
|
import {
|
||||||
@@ -75,7 +76,7 @@ export class CompassCalibrationLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
if (event.type === "scroll-up") {
|
if (event.type === "scroll-up") {
|
||||||
this.adjust(1);
|
this.adjust(1);
|
||||||
} else if (event.type === "scroll-down") {
|
} else if (event.type === "scroll-down") {
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import {
|
|||||||
type CompassEvent,
|
type CompassEvent,
|
||||||
} from "../../native/compass";
|
} from "../../native/compass";
|
||||||
import { wrapText } from "../../graphics/textwrap";
|
import { wrapText } from "../../graphics/textwrap";
|
||||||
import { type DashboardInputEvent, type Layer, type LayerContext } from "../../ui/layers";
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { type Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { lineStep } from "../../ui/metrics";
|
import { lineStep } from "../../ui/metrics";
|
||||||
import { screenCenterInViewportX } from "../../ui/shell/geometry";
|
import { screenCenterInViewportX } from "../../ui/shell/geometry";
|
||||||
import {
|
import {
|
||||||
@@ -205,7 +206,7 @@ class CompassLayer implements Layer {
|
|||||||
// A tap opens calibration from either state: it is the affordance the
|
// A tap opens calibration from either state: it is the affordance the
|
||||||
// "Uncalibrated" prompt advertises, and re-calibrating is a normal thing to
|
// "Uncalibrated" prompt advertises, and re-calibrating is a normal thing to
|
||||||
// want once the glasses have been taken off and put back on.
|
// want once the glasses have been taken off and put back on.
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
if (event.type === "click") this.openCalibration(ctx);
|
if (event.type === "click") this.openCalibration(ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ import { getDefaultMediumFont, getDefaultSmallFont } from "../../graphics/ui-fon
|
|||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { clamp } from "../../util/numeric-util";
|
import { clamp } from "../../util/numeric-util";
|
||||||
import { addImuListener, imuSourceLabel, setImuReportEnabled, type ImuReading } from "../../native/imu";
|
import { addImuListener, imuSourceLabel, setImuReportEnabled, type ImuReading } from "../../native/imu";
|
||||||
import { GESTURE_DOUBLE_CLICK } from "../../ui/gestures";
|
import { GESTURE_DOUBLE_CLICK, type InputEvent } from "../../ui/gestures";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext } from "../../ui/layers";
|
import { Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { shell } from "../../ui/shell/shell";
|
import { shell } from "../../ui/shell/shell";
|
||||||
|
|
||||||
// IMU report pace. This is NOT a literal Hz — the firmware only accepts the
|
// IMU report pace. This is NOT a literal Hz — the firmware only accepts the
|
||||||
@@ -119,7 +119,7 @@ export class AccelerometerDemoLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
if (event.type === "double-click") {
|
if (event.type === "double-click") {
|
||||||
ctx.stack.pop();
|
ctx.stack.pop();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { clamp } from "../../util/numeric-util";
|
import { clamp } from "../../util/numeric-util";
|
||||||
import { Layer, type DashboardInputEvent, type LayerActions, type LayerContext } from "../../ui/layers";
|
import { Layer, type LayerActions, type LayerContext } from "../../ui/layers";
|
||||||
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, GESTURE_SCROLL } from "../../ui/gestures";
|
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, GESTURE_SCROLL, type InputEvent } from "../../ui/gestures";
|
||||||
import { drawSelectionHighlight, scrollToKeepSelectionVisible } from "../../ui/menu";
|
import { drawSelectionHighlight, scrollToKeepSelectionVisible } from "../../ui/menu";
|
||||||
import { tightRowHeight } from "../../ui/metrics";
|
import { tightRowHeight } from "../../ui/metrics";
|
||||||
import {
|
import {
|
||||||
@@ -61,7 +61,7 @@ export class BuzzerDemoLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "scroll-up":
|
case "scroll-up":
|
||||||
this.selectedIndex = Math.max(0, this.selectedIndex - 1);
|
this.selectedIndex = Math.max(0, this.selectedIndex - 1);
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
|||||||
import { wrapText } from "../../graphics/textwrap";
|
import { wrapText } from "../../graphics/textwrap";
|
||||||
import { type AppContext } from "../app-definition";
|
import { type AppContext } from "../app-definition";
|
||||||
import { isLoadableAppUrl, openEvenHubUrl } from "../evenhub";
|
import { isLoadableAppUrl, openEvenHubUrl } from "../evenhub";
|
||||||
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK } from "../../ui/gestures";
|
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, type InputEvent } from "../../ui/gestures";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext } from "../../ui/layers";
|
import { Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { lineStep } from "../../ui/metrics";
|
import { lineStep } from "../../ui/metrics";
|
||||||
import { developerAppUrlSetting } from "../../ui/dashboard-settings";
|
import { developerAppUrlSetting } from "../../ui/dashboard-settings";
|
||||||
import { isQrScannerAvailable, scanQrCode } from "../../native/qr-scan";
|
import { isQrScannerAvailable, scanQrCode } from "../../native/qr-scan";
|
||||||
@@ -76,7 +76,7 @@ export class LoadAppFromUrlLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "click":
|
case "click":
|
||||||
void this.launch(ctx);
|
void this.launch(ctx);
|
||||||
@@ -153,7 +153,7 @@ export class LoadAppFromQrLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "click":
|
case "click":
|
||||||
if (!this.busy && isQrScannerAvailable()) {
|
if (!this.busy && isQrScannerAvailable()) {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { clamp } from "../../util/numeric-util";
|
import { clamp } from "../../util/numeric-util";
|
||||||
import { GESTURE_DOUBLE_CLICK } from "../../ui/gestures";
|
import { GESTURE_DOUBLE_CLICK, type InputEvent } from "../../ui/gestures";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext } from "../../ui/layers";
|
import { Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { shell } from "../../ui/shell/shell";
|
import { shell } from "../../ui/shell/shell";
|
||||||
|
|
||||||
declare const com: any;
|
declare const com: any;
|
||||||
@@ -110,7 +110,7 @@ export class ResourceUsageLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
if (event.type === "double-click") {
|
if (event.type === "double-click") {
|
||||||
ctx.stack.pop();
|
ctx.stack.pop();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext } from "../../ui/layers";
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { drawListScrollbar } from "../../ui/menu";
|
import { drawListScrollbar } from "../../ui/menu";
|
||||||
|
|
||||||
const COLOR_VALUE_COUNT = 256;
|
const COLOR_VALUE_COUNT = 256;
|
||||||
@@ -49,7 +50,7 @@ export class ScreenTestLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "scroll-up":
|
case "scroll-up":
|
||||||
this.scrollRow = Math.max(0, this.scrollRow - 1);
|
this.scrollRow = Math.max(0, this.scrollRow - 1);
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { truncateText } from "../../graphics/textwrap";
|
import { truncateText } from "../../graphics/textwrap";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext, type PaintBelow } from "../../ui/layers";
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
|
||||||
import { drawSelectionHighlight } from "../../ui/menu";
|
import { drawSelectionHighlight } from "../../ui/menu";
|
||||||
import { LIST_ROW_TEXT_INSET, lineStep, listRowHeight } from "../../ui/metrics";
|
import { LIST_ROW_TEXT_INSET, lineStep, listRowHeight } from "../../ui/metrics";
|
||||||
|
|
||||||
@@ -79,7 +80,7 @@ export class EvenHubApiKeyDialogLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "scroll-up":
|
case "scroll-up":
|
||||||
case "scroll-down":
|
case "scroll-down":
|
||||||
|
|||||||
+144
-12
@@ -1,24 +1,86 @@
|
|||||||
import { ConfigSettingString } from "../../ui/dashboard-settings";
|
import {
|
||||||
|
ConfigSettingBoolean,
|
||||||
|
ConfigSettingString,
|
||||||
|
} from "../../ui/dashboard-settings";
|
||||||
|
import { getStringSetting, setStringSetting } from "../../native/settings-store";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EvenHub owns its account configuration. The storage keys intentionally
|
* Persistent EvenHub session data. Passwords are deliberately excluded: the
|
||||||
* match the former Settings-app entries so existing users stay signed in.
|
* password entered in the login form lives only in memory until the request
|
||||||
|
* completes, while a successful login may persist the returned token.
|
||||||
*/
|
*/
|
||||||
export const evenHubEmailSetting = new ConfigSettingString({
|
export const evenHubEmailSetting = new ConfigSettingString({
|
||||||
id: "evenhub-email",
|
id: "evenhub-saved-email",
|
||||||
label: "Email",
|
label: "Email",
|
||||||
storageKey: "integrations.evenhub.email",
|
storageKey: "integrations.evenhub.email",
|
||||||
defaultValue: "",
|
defaultValue: "",
|
||||||
|
normalize: normalizeEmail,
|
||||||
|
});
|
||||||
|
|
||||||
|
export const evenHubTokenSetting = new ConfigSettingString({
|
||||||
|
id: "evenhub-token",
|
||||||
|
label: "Login token",
|
||||||
|
storageKey: "integrations.evenhub.token",
|
||||||
|
defaultValue: "",
|
||||||
|
inputKind: "password",
|
||||||
|
normalize: normalizeToken,
|
||||||
|
formatValue: (value) => (value ? "(signed in)" : "(signed out)"),
|
||||||
|
});
|
||||||
|
|
||||||
|
class TransientStringSetting extends ConfigSettingString {
|
||||||
|
private value: string;
|
||||||
|
private readonly normalizeValue: (value: string | null | undefined) => string;
|
||||||
|
|
||||||
|
constructor(options: ConstructorParameters<typeof ConfigSettingString>[0]) {
|
||||||
|
super(options);
|
||||||
|
this.normalizeValue = options.normalize ?? ((value) => value ?? "");
|
||||||
|
this.value = this.normalizeValue(options.defaultValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
override get(): string {
|
||||||
|
return this.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
override set(value: string): string {
|
||||||
|
this.value = this.normalizeValue(value);
|
||||||
|
return this.value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TransientBooleanSetting extends ConfigSettingBoolean {
|
||||||
|
private value: boolean;
|
||||||
|
|
||||||
|
constructor(options: ConstructorParameters<typeof ConfigSettingBoolean>[0]) {
|
||||||
|
super(options);
|
||||||
|
this.value = options.defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
override get(): boolean {
|
||||||
|
return this.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
override set(value: boolean): boolean {
|
||||||
|
this.value = value;
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Phone login-form values. These overrides never touch the settings store. */
|
||||||
|
export const evenHubLoginEmailSetting = new TransientStringSetting({
|
||||||
|
id: "evenhub-login-email",
|
||||||
|
label: "Email",
|
||||||
|
storageKey: "transient.evenhub.email",
|
||||||
|
defaultValue: "",
|
||||||
editorTitle: "Email",
|
editorTitle: "Email",
|
||||||
glassesEditTitle: "Edit Even email",
|
glassesEditTitle: "Edit Even email",
|
||||||
inputKind: "email",
|
inputKind: "email",
|
||||||
normalize: (value) => (value ?? "").replace(/[\x00-\x1f]+/g, "").trim(),
|
normalize: normalizeEmail,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const evenHubPasswordSetting = new ConfigSettingString({
|
export const evenHubLoginPasswordSetting = new TransientStringSetting({
|
||||||
id: "evenhub-password",
|
id: "evenhub-login-password",
|
||||||
label: "Password",
|
label: "Password",
|
||||||
storageKey: "integrations.evenhub.password",
|
storageKey: "transient.evenhub.password",
|
||||||
defaultValue: "",
|
defaultValue: "",
|
||||||
editorTitle: "Password",
|
editorTitle: "Password",
|
||||||
glassesEditTitle: "Edit Even password",
|
glassesEditTitle: "Edit Even password",
|
||||||
@@ -27,10 +89,80 @@ export const evenHubPasswordSetting = new ConfigSettingString({
|
|||||||
formatValue: (value) => (value ? "(set)" : "(not set)"),
|
formatValue: (value) => (value ? "(set)" : "(not set)"),
|
||||||
});
|
});
|
||||||
|
|
||||||
export function hasEvenHubCredentials(): boolean {
|
export const evenHubRememberMeSetting = new TransientBooleanSetting({
|
||||||
return Boolean(evenHubEmailSetting.get().trim() && evenHubPasswordSetting.get());
|
id: "evenhub-remember-me",
|
||||||
|
label: "Remember me",
|
||||||
|
storageKey: "transient.evenhub.rememberMe",
|
||||||
|
defaultValue: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
let transientToken = "";
|
||||||
|
|
||||||
|
export function getEvenHubToken(): string {
|
||||||
|
return transientToken || evenHubTokenSetting.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function clearEvenHubPassword(): void {
|
export function hasEvenHubCredentials(): boolean {
|
||||||
evenHubPasswordSetting.set("");
|
return Boolean(getEvenHubToken());
|
||||||
|
}
|
||||||
|
|
||||||
|
export function saveEvenHubSession(email: string, token: string, remember: boolean): void {
|
||||||
|
const normalizedEmail = normalizeEmail(email);
|
||||||
|
const normalizedToken = normalizeToken(token);
|
||||||
|
if (remember) {
|
||||||
|
evenHubEmailSetting.set(normalizedEmail);
|
||||||
|
evenHubTokenSetting.set(normalizedToken);
|
||||||
|
transientToken = "";
|
||||||
|
} else {
|
||||||
|
evenHubEmailSetting.set("");
|
||||||
|
evenHubTokenSetting.set("");
|
||||||
|
transientToken = normalizedToken;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Clear a rejected token but retain a remembered email for the next login. */
|
||||||
|
export function invalidateEvenHubToken(): void {
|
||||||
|
transientToken = "";
|
||||||
|
evenHubTokenSetting.set("");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearEvenHubSession(): void {
|
||||||
|
transientToken = "";
|
||||||
|
evenHubEmailSetting.set("");
|
||||||
|
evenHubTokenSetting.set("");
|
||||||
|
clearEvenHubLoginForm();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function resetEvenHubLoginForm(): void {
|
||||||
|
evenHubLoginEmailSetting.set(evenHubEmailSetting.get());
|
||||||
|
evenHubLoginPasswordSetting.set("");
|
||||||
|
evenHubRememberMeSetting.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function clearEvenHubLoginForm(): void {
|
||||||
|
evenHubLoginEmailSetting.set("");
|
||||||
|
evenHubLoginPasswordSetting.set("");
|
||||||
|
evenHubRememberMeSetting.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Discard a window-scoped session; remembered sessions are left intact. */
|
||||||
|
export function clearTransientEvenHubSession(): void {
|
||||||
|
if (transientToken) transientToken = "";
|
||||||
|
clearEvenHubLoginForm();
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeEmail(value: string | null | undefined): string {
|
||||||
|
return (value ?? "").replace(/[\x00-\x1f]+/g, "").trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeToken(value: string | null | undefined): string {
|
||||||
|
return (value ?? "").replace(/[\x00-\x20\x7f]+/g, "").trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
// One-time security migration from builds that persisted the account password.
|
||||||
|
// Existing users must sign in once more so the password can be exchanged for a
|
||||||
|
// token under the new storage model.
|
||||||
|
const LEGACY_PASSWORD_KEY = "integrations.evenhub.password";
|
||||||
|
if (getStringSetting(LEGACY_PASSWORD_KEY, "")) {
|
||||||
|
setStringSetting(LEGACY_PASSWORD_KEY, "");
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,12 @@
|
|||||||
* the same signed-header scheme used by the firmware API.
|
* the same signed-header scheme used by the firmware API.
|
||||||
*/
|
*/
|
||||||
import { Application } from "@nativescript/core";
|
import { Application } from "@nativescript/core";
|
||||||
import { evenHubEmailSetting, evenHubPasswordSetting, hasEvenHubCredentials } from "./credentials";
|
import {
|
||||||
|
getEvenHubToken,
|
||||||
|
hasEvenHubCredentials,
|
||||||
|
invalidateEvenHubToken,
|
||||||
|
saveEvenHubSession,
|
||||||
|
} from "./credentials";
|
||||||
import { fetchWithUserAgent } from "../../util/http";
|
import { fetchWithUserAgent } from "../../util/http";
|
||||||
|
|
||||||
declare const android: any;
|
declare const android: any;
|
||||||
@@ -72,7 +77,6 @@ export class EvenHubAuthenticationError extends Error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class EvenHubApiClient {
|
export class EvenHubApiClient {
|
||||||
private token = "";
|
|
||||||
private loginPromise: Promise<string> | null = null;
|
private loginPromise: Promise<string> | null = null;
|
||||||
|
|
||||||
async listApps(page = 1, category = ""): Promise<EvenHubStorePage> {
|
async listApps(page = 1, category = ""): Promise<EvenHubStorePage> {
|
||||||
@@ -147,9 +151,13 @@ export class EvenHubApiClient {
|
|||||||
return { bytes, extension: extension === "jpeg" ? "jpg" : extension };
|
return { bytes, extension: extension === "jpeg" ? "jpg" : extension };
|
||||||
}
|
}
|
||||||
|
|
||||||
clearSession(): void {
|
async signIn(email: string, password: string, remember: boolean): Promise<void> {
|
||||||
this.token = "";
|
if (!this.loginPromise) {
|
||||||
this.loginPromise = null;
|
this.loginPromise = this.login(email, password, remember).finally(() => {
|
||||||
|
this.loginPromise = null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
await this.loginPromise;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async authenticatedRequest(
|
private async authenticatedRequest(
|
||||||
@@ -158,38 +166,30 @@ export class EvenHubApiClient {
|
|||||||
options: { query?: Record<string, string | number>; body?: Record<string, unknown> } = {},
|
options: { query?: Record<string, string | number>; body?: Record<string, unknown> } = {},
|
||||||
): Promise<unknown> {
|
): Promise<unknown> {
|
||||||
let token = await this.ensureLogin();
|
let token = await this.ensureLogin();
|
||||||
let response = await this.request(method, path, { ...options, token, commonVersion: 3 });
|
const response = await this.request(method, path, { ...options, token, commonVersion: 3 });
|
||||||
if (response.httpStatus === 401) {
|
if (response.httpStatus === 401) {
|
||||||
this.clearSession();
|
invalidateEvenHubToken();
|
||||||
token = await this.ensureLogin();
|
|
||||||
response = await this.request(method, path, { ...options, token, commonVersion: 3 });
|
|
||||||
}
|
}
|
||||||
return unwrap(response.envelope, response.httpStatus, path);
|
return unwrap(response.envelope, response.httpStatus, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ensureLogin(): Promise<string> {
|
private ensureLogin(): Promise<string> {
|
||||||
if (this.token) return Promise.resolve(this.token);
|
const token = getEvenHubToken();
|
||||||
if (!isEvenHubStoreConfigured()) {
|
return token
|
||||||
return Promise.reject(new EvenHubAuthenticationError("Enter your Even account email and password."));
|
? Promise.resolve(token)
|
||||||
}
|
: Promise.reject(new EvenHubAuthenticationError("Enter your Even account email and password."));
|
||||||
if (!this.loginPromise) {
|
|
||||||
this.loginPromise = this.login().finally(() => {
|
|
||||||
this.loginPromise = null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return this.loginPromise;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async login(): Promise<string> {
|
private async login(email: string, password: string, remember: boolean): Promise<string> {
|
||||||
try {
|
try {
|
||||||
const response = await this.request("POST", "/v2/g/login", {
|
const response = await this.request("POST", "/v2/g/login", {
|
||||||
commonVersion: 1,
|
commonVersion: 1,
|
||||||
body: { email: evenHubEmailSetting.get().trim(), passwd: evenHubPasswordSetting.get() },
|
body: { email: email.trim(), passwd: password },
|
||||||
});
|
});
|
||||||
const data = asRecord(unwrap(response.envelope, response.httpStatus, "/v2/g/login"));
|
const data = asRecord(unwrap(response.envelope, response.httpStatus, "/v2/g/login"));
|
||||||
const token = typeof data.token === "string" ? data.token : "";
|
const token = typeof data.token === "string" ? data.token : "";
|
||||||
if (!token) throw new Error("Even login succeeded without returning a session token.");
|
if (!token) throw new Error("Even login succeeded without returning a session token.");
|
||||||
this.token = token;
|
saveEvenHubSession(email, token, remember);
|
||||||
return token;
|
return token;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof EvenHubAuthenticationError) throw error;
|
if (error instanceof EvenHubAuthenticationError) throw error;
|
||||||
|
|||||||
@@ -4,7 +4,9 @@
|
|||||||
* makes the content area exactly the 576x288 surface EvenHub apps expect.
|
* makes the content area exactly the 576x288 surface EvenHub apps expect.
|
||||||
*/
|
*/
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { type DashboardInputEvent, type Layer, type LayerContext } from "../../ui/layers";
|
import { EVENHUB_SCREEN_WIDTH } from "./compositor";
|
||||||
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { type Layer, type LayerContext } from "../../ui/layers";
|
||||||
import {
|
import {
|
||||||
createInProcessWindow,
|
createInProcessWindow,
|
||||||
type InProcessAppOptions,
|
type InProcessAppOptions,
|
||||||
@@ -20,10 +22,19 @@ class EvenHubAppLayer implements Layer {
|
|||||||
|
|
||||||
paint(ctx: LayerContext): GrayImage {
|
paint(ctx: LayerContext): GrayImage {
|
||||||
const size = ctx.stack.getBaseSize();
|
const size = ctx.stack.getBaseSize();
|
||||||
|
// EvenHub apps lay out for the stock 576-wide surface. In the full-panel
|
||||||
|
// display mode the window is 640 wide; paint at stock width and centre
|
||||||
|
// it rather than leaving all the slack on the right.
|
||||||
|
if (size.width > EVENHUB_SCREEN_WIDTH) {
|
||||||
|
const content = this.session.paint({ width: EVENHUB_SCREEN_WIDTH, height: size.height }, ctx.stack.isFocused());
|
||||||
|
const image = new GrayImage(size.width, size.height, 0);
|
||||||
|
content.composeInto(image, Math.floor((size.width - EVENHUB_SCREEN_WIDTH) / 2), 0);
|
||||||
|
return image;
|
||||||
|
}
|
||||||
return this.session.paint(size, ctx.stack.isFocused());
|
return this.session.paint(size, ctx.stack.isFocused());
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent): void {
|
handleInput(event: InputEvent): void {
|
||||||
// Everything goes to the app; long-press never reaches here (the window
|
// Everything goes to the app; long-press never reaches here (the window
|
||||||
// menu intercepts it), which is the guaranteed way out since EvenHub
|
// menu intercepts it), which is the guaranteed way out since EvenHub
|
||||||
// apps own double-click.
|
// apps own double-click.
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ const evenhubApp: AppDefinition = {
|
|||||||
setSurfaceVisible: options.setSurfaceVisible,
|
setSurfaceVisible: options.setSurfaceVisible,
|
||||||
removeSurface: options.removeSurface,
|
removeSurface: options.removeSurface,
|
||||||
onClosed: () => {
|
onClosed: () => {
|
||||||
store.closeCredentialEditor(options.actions);
|
store.onWindowClosed(options.actions);
|
||||||
options.onClosed();
|
options.onClosed();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { truncateText } from "../../graphics/textwrap";
|
import { truncateText } from "../../graphics/textwrap";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext, type PaintBelow } from "../../ui/layers";
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
|
||||||
import { drawSelectionHighlight } from "../../ui/menu";
|
import { drawSelectionHighlight } from "../../ui/menu";
|
||||||
import { permissionDetail, permissionLabel, type EvenHubPermission } from "./permissions";
|
import { permissionDetail, permissionLabel, type EvenHubPermission } from "./permissions";
|
||||||
import { openPrivacyPolicyOnPhone } from "./privacy-policy";
|
import { openPrivacyPolicyOnPhone } from "./privacy-policy";
|
||||||
@@ -89,7 +90,7 @@ export class EvenHubPermissionDialogLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
const actions = this.actions();
|
const actions = this.actions();
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "scroll-up":
|
case "scroll-up":
|
||||||
|
|||||||
@@ -20,7 +20,8 @@
|
|||||||
import { ApplicationSettings } from "@nativescript/core";
|
import { ApplicationSettings } from "@nativescript/core";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { EvenHubFont } from "../../graphics/evenhub-font";
|
import { EvenHubFont } from "../../graphics/evenhub-font";
|
||||||
import { type DashboardInputEvent, type Layer } from "../../ui/layers";
|
import { type InputEvent, type InputSource } from "../../ui/gestures";
|
||||||
|
import { type Layer } from "../../ui/layers";
|
||||||
import {
|
import {
|
||||||
anthropicApiKeySetting,
|
anthropicApiKeySetting,
|
||||||
elevenLabsApiKeySetting,
|
elevenLabsApiKeySetting,
|
||||||
@@ -425,7 +426,7 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
|
|||||||
* fields elided the way protobuf JSON elides them; list selection moves
|
* fields elided the way protobuf JSON elides them; list selection moves
|
||||||
* locally with events only for clicks and boundary scrolls.
|
* locally with events only for clicks and boundary scrolls.
|
||||||
*/
|
*/
|
||||||
handleGesture(event: DashboardInputEvent): void {
|
handleGesture(event: InputEvent): void {
|
||||||
if (!this.page) return;
|
if (!this.page) return;
|
||||||
const capture = this.page ? eventCaptureContainer(this.page) : undefined;
|
const capture = this.page ? eventCaptureContainer(this.page) : undefined;
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
@@ -1346,12 +1347,17 @@ function luminance(r: number, g: number, b: number): number {
|
|||||||
return Math.round(0.2126 * r + 0.7152 * g + 0.0722 * b);
|
return Math.round(0.2126 * r + 0.7152 * g + 0.0722 * b);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ring/left-arm/right-arm -> PB EventSourceType. */
|
/**
|
||||||
function gestureSource(source: "ring" | "left-arm" | "right-arm"): number {
|
* ring/left-arm/right-arm -> PB EventSourceType. The watch is reported to
|
||||||
|
* EvenHub apps as the ring: they only know stock hardware, and the watch's
|
||||||
|
* ring-vocabulary gestures mean the same thing.
|
||||||
|
*/
|
||||||
|
function gestureSource(source: InputSource): number {
|
||||||
switch (source) {
|
switch (source) {
|
||||||
case "right-arm":
|
case "right-arm":
|
||||||
return 1;
|
return 1;
|
||||||
case "ring":
|
case "ring":
|
||||||
|
case "watch":
|
||||||
return 2;
|
return 2;
|
||||||
case "left-arm":
|
case "left-arm":
|
||||||
return 3;
|
return 3;
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||||
import { GrayImage } from "../../graphics/image";
|
import { GrayImage } from "../../graphics/image";
|
||||||
import { truncateText, wrapText } from "../../graphics/textwrap";
|
import { truncateText, wrapText } from "../../graphics/textwrap";
|
||||||
import { type DashboardInputEvent, type Layer, type LayerContext } from "../../ui/layers";
|
import { type InputEvent } from "../../ui/gestures";
|
||||||
|
import { type Layer, type LayerContext } from "../../ui/layers";
|
||||||
import { drawSelectionHighlight } from "../../ui/menu";
|
import { drawSelectionHighlight } from "../../ui/menu";
|
||||||
import { TextViewerLayer } from "../files/text-viewer";
|
import { TextViewerLayer } from "../files/text-viewer";
|
||||||
import { evenHubApi, type EvenHubStoreApp } from "./even-api";
|
import { evenHubApi, type EvenHubStoreApp } from "./even-api";
|
||||||
@@ -109,7 +110,7 @@ export class EvenHubStoreDetailLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
if (event.type === "double-click") {
|
if (event.type === "double-click") {
|
||||||
if (!this.working) ctx.stack.pop();
|
if (!this.working) ctx.stack.pop();
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -2,26 +2,12 @@ import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
|||||||
import { GrayImage, type UiFont } from "../../graphics/image";
|
import { GrayImage, type UiFont } from "../../graphics/image";
|
||||||
import { truncateText, wrapText } from "../../graphics/textwrap";
|
import { truncateText, wrapText } from "../../graphics/textwrap";
|
||||||
import { clamp } from "../../util/numeric-util";
|
import { clamp } from "../../util/numeric-util";
|
||||||
import { GESTURE_CLICK } from "../../ui/gestures";
|
import { GESTURE_CLICK, type InputEvent } from "../../ui/gestures";
|
||||||
import { type DashboardInputEvent, type Layer, type LayerActions, type LayerContext } from "../../ui/layers";
|
import { type Layer, type LayerActions, type LayerContext } from "../../ui/layers";
|
||||||
import {
|
import { drawListScrollbar, drawSelectionHighlight, scrollToKeepSelectionVisible, type MenuItem } from "../../ui/menu";
|
||||||
drawListScrollbar,
|
|
||||||
drawSelectionHighlight,
|
|
||||||
scrollToKeepSelectionVisible,
|
|
||||||
type MenuItem,
|
|
||||||
} from "../../ui/menu";
|
|
||||||
import { shell } from "../../ui/shell/shell";
|
import { shell } from "../../ui/shell/shell";
|
||||||
import {
|
import { evenHubApi, EvenHubAuthenticationError, isEvenHubStoreConfigured, type EvenHubStoreApp } from "./even-api";
|
||||||
evenHubApi,
|
import { clearEvenHubLoginForm, clearEvenHubSession, clearTransientEvenHubSession, evenHubLoginEmailSetting, evenHubLoginPasswordSetting, evenHubRememberMeSetting, resetEvenHubLoginForm } from "./credentials";
|
||||||
EvenHubAuthenticationError,
|
|
||||||
isEvenHubStoreConfigured,
|
|
||||||
type EvenHubStoreApp,
|
|
||||||
} from "./even-api";
|
|
||||||
import {
|
|
||||||
clearEvenHubPassword,
|
|
||||||
evenHubEmailSetting,
|
|
||||||
evenHubPasswordSetting,
|
|
||||||
} from "./credentials";
|
|
||||||
import { EvenHubStoreDetailLayer } from "./store-detail-layer";
|
import { EvenHubStoreDetailLayer } from "./store-detail-layer";
|
||||||
import { lineStep } from "../../ui/metrics";
|
import { lineStep } from "../../ui/metrics";
|
||||||
|
|
||||||
@@ -49,8 +35,11 @@ export class EvenHubStoreLayer implements Layer {
|
|||||||
private showingLogin = !isEvenHubStoreConfigured();
|
private showingLogin = !isEvenHubStoreConfigured();
|
||||||
private status = this.showingLogin ? "Sign in to browse public apps." : "";
|
private status = this.showingLogin ? "Sign in to browse public apps." : "";
|
||||||
private credentialEditorOpen = false;
|
private credentialEditorOpen = false;
|
||||||
|
private closed = false;
|
||||||
|
|
||||||
constructor(private readonly options: EvenHubStoreLayerOptions) {}
|
constructor(private readonly options: EvenHubStoreLayerOptions) {
|
||||||
|
if (this.showingLogin) resetEvenHubLoginForm();
|
||||||
|
}
|
||||||
|
|
||||||
paint(ctx: LayerContext): GrayImage {
|
paint(ctx: LayerContext): GrayImage {
|
||||||
if (!this.started) {
|
if (!this.started) {
|
||||||
@@ -115,7 +104,7 @@ export class EvenHubStoreLayer implements Layer {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
if (this.showingLogin) {
|
if (this.showingLogin) {
|
||||||
if (event.type === "click" && !this.loading) {
|
if (event.type === "click" && !this.loading) {
|
||||||
this.openCredentialEditor(ctx);
|
this.openCredentialEditor(ctx);
|
||||||
@@ -169,8 +158,7 @@ export class EvenHubStoreLayer implements Layer {
|
|||||||
label: "Log Out",
|
label: "Log Out",
|
||||||
onSelect: (ctx) => {
|
onSelect: (ctx) => {
|
||||||
ctx.stack.pop();
|
ctx.stack.pop();
|
||||||
clearEvenHubPassword();
|
clearEvenHubSession();
|
||||||
evenHubApi.clearSession();
|
|
||||||
this.enterLogin(ctx, "Signed out.");
|
this.enterLogin(ctx, "Signed out.");
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -183,9 +171,14 @@ export class EvenHubStoreLayer implements Layer {
|
|||||||
void actions.endTextSettingEdit();
|
void actions.endTextSettingEdit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onWindowClosed(actions: Pick<LayerActions, "endTextSettingEdit">): void {
|
||||||
|
this.closed = true;
|
||||||
|
this.closeCredentialEditor(actions);
|
||||||
|
clearTransientEvenHubSession();
|
||||||
|
}
|
||||||
|
|
||||||
private async reload(ctx: LayerContext): Promise<void> {
|
private async reload(ctx: LayerContext): Promise<void> {
|
||||||
if (this.loading) return;
|
if (this.loading) return;
|
||||||
evenHubApi.clearSession();
|
|
||||||
this.apps = [];
|
this.apps = [];
|
||||||
this.total = 0;
|
this.total = 0;
|
||||||
this.nextPage = 1;
|
this.nextPage = 1;
|
||||||
@@ -227,11 +220,13 @@ export class EvenHubStoreLayer implements Layer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private enterLogin(ctx: LayerContext, status = "Sign in to browse public apps."): void {
|
private enterLogin(ctx: LayerContext, status = "Sign in to browse public apps."): void {
|
||||||
|
const wasShowingLogin = this.showingLogin;
|
||||||
this.showingLogin = true;
|
this.showingLogin = true;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.apps = [];
|
this.apps = [];
|
||||||
this.total = 0;
|
this.total = 0;
|
||||||
this.status = status;
|
this.status = status;
|
||||||
|
if (!wasShowingLogin) resetEvenHubLoginForm();
|
||||||
this.openCredentialEditor(ctx);
|
this.openCredentialEditor(ctx);
|
||||||
ctx.actions.requestRender();
|
ctx.actions.requestRender();
|
||||||
}
|
}
|
||||||
@@ -240,22 +235,48 @@ export class EvenHubStoreLayer implements Layer {
|
|||||||
if (this.credentialEditorOpen) return;
|
if (this.credentialEditorOpen) return;
|
||||||
this.credentialEditorOpen = true;
|
this.credentialEditorOpen = true;
|
||||||
void ctx.actions.startTextSettingsEdit(
|
void ctx.actions.startTextSettingsEdit(
|
||||||
[evenHubEmailSetting, evenHubPasswordSetting],
|
[evenHubLoginEmailSetting, evenHubLoginPasswordSetting],
|
||||||
"Sign in to EvenHub",
|
"Sign in to EvenHub",
|
||||||
() => {
|
() => {
|
||||||
this.credentialEditorOpen = false;
|
this.credentialEditorOpen = false;
|
||||||
void this.submitCredentials(ctx);
|
void this.submitCredentials(ctx);
|
||||||
},
|
},
|
||||||
|
{ setting: evenHubRememberMeSetting, label: "Remember me" },
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async submitCredentials(ctx: LayerContext): Promise<void> {
|
private async submitCredentials(ctx: LayerContext): Promise<void> {
|
||||||
if (!isEvenHubStoreConfigured()) {
|
const email = evenHubLoginEmailSetting.get();
|
||||||
|
const password = evenHubLoginPasswordSetting.get();
|
||||||
|
if (!email.trim() || !password) {
|
||||||
this.enterLogin(ctx, "Email and password are required.");
|
this.enterLogin(ctx, "Email and password are required.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.showingLogin = false;
|
this.loading = true;
|
||||||
await this.reload(ctx);
|
this.status = "Signing in...";
|
||||||
|
ctx.actions.requestRender();
|
||||||
|
try {
|
||||||
|
await evenHubApi.signIn(email, password, evenHubRememberMeSetting.get());
|
||||||
|
if (this.closed) {
|
||||||
|
clearTransientEvenHubSession();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.showingLogin = false;
|
||||||
|
clearEvenHubLoginForm();
|
||||||
|
this.loading = false;
|
||||||
|
await this.reload(ctx);
|
||||||
|
} catch (error) {
|
||||||
|
if (this.closed) return;
|
||||||
|
const message = cleanError(error);
|
||||||
|
this.options.appendLog(`evenhub store login failed: ${message}`);
|
||||||
|
this.status = `Login failed: ${message}`;
|
||||||
|
evenHubLoginPasswordSetting.set("");
|
||||||
|
this.openCredentialEditor(ctx);
|
||||||
|
} finally {
|
||||||
|
evenHubLoginPasswordSetting.set("");
|
||||||
|
this.loading = false;
|
||||||
|
if (!this.closed) ctx.actions.requestRender();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ import {
|
|||||||
statPath,
|
statPath,
|
||||||
type DirectoryEntry,
|
type DirectoryEntry,
|
||||||
} from "../../native/file-access";
|
} from "../../native/file-access";
|
||||||
import { Layer, type DashboardInputEvent, type LayerContext } from "../../ui/layers";
|
import { directionalFallback, isWatchInput, type InputEvent } from "../../ui/gestures";
|
||||||
|
import { Layer, type LayerContext } from "../../ui/layers";
|
||||||
|
import { shell } from "../../ui/shell/shell";
|
||||||
|
|
||||||
const LIST_X = 20;
|
const LIST_X = 20;
|
||||||
|
|
||||||
@@ -113,9 +115,17 @@ type IconMode = "row" | "item";
|
|||||||
* click drops into the row, scroll picks the item); list view is a flat list.
|
* click drops into the row, scroll picks the item); list view is a flat list.
|
||||||
* Click descends into a directory or picks a supported file; double-click
|
* Click descends into a directory or picks a supported file; double-click
|
||||||
* backs out one level (item selection, then parent directory, then Places,
|
* backs out one level (item selection, then parent directory, then Places,
|
||||||
* then leaving the browser). Sized to its hosting stack.
|
* then leaving the browser). That is the ring's scheme; in icons view the
|
||||||
|
* watch (see handleIconsWatchInput) skips row mode and moves one cell at a
|
||||||
|
* time in four directions, exactly as in the launcher. Sized to its hosting
|
||||||
|
* stack.
|
||||||
*/
|
*/
|
||||||
export class FileBrowserLayer implements Layer {
|
export class FileBrowserLayer implements Layer {
|
||||||
|
// Watch swipes are spatial in icons view: up/down move between rows,
|
||||||
|
// left/right between columns. From the leftmost column, left keeps going
|
||||||
|
// out (parent directory, Places, then the sidebar). List view maps swipes
|
||||||
|
// through directionalFallback itself.
|
||||||
|
readonly acceptsDirectional = true;
|
||||||
/** Current directory, or null at the Places level. */
|
/** Current directory, or null at the Places level. */
|
||||||
private location: string | null = null;
|
private location: string | null = null;
|
||||||
/** The Places entry we descended through; going up from it returns to Places. */
|
/** The Places entry we descended through; going up from it returns to Places. */
|
||||||
@@ -202,11 +212,16 @@ export class FileBrowserLayer implements Layer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (selected) {
|
if (selected) {
|
||||||
if (this.iconMode === "row") {
|
// Same preview rule as the launcher: while defocused with the watch
|
||||||
drawSelectionHighlight(image, 4, y + 1, width - 8, rowH - 2, focused, 6);
|
// as the last-used source, show the cell a click would land on (watch
|
||||||
} else {
|
// focus enters item mode directly; see onFocus) instead of a row band
|
||||||
|
// the watch scheme never shows.
|
||||||
|
const cellHighlight = this.iconMode === "item" || (!focused && shell.lastInputWasWatch());
|
||||||
|
if (cellHighlight) {
|
||||||
this.selectedCol = clamp(this.selectedCol, 0, row.items.length - 1);
|
this.selectedCol = clamp(this.selectedCol, 0, row.items.length - 1);
|
||||||
drawSelectionHighlight(image, this.selectedCol * colW + 4, y + 1, colW - 8, rowH - 2, focused, 6);
|
drawSelectionHighlight(image, this.selectedCol * colW + 4, y + 1, colW - 8, rowH - 2, focused, 6);
|
||||||
|
} else {
|
||||||
|
drawSelectionHighlight(image, 4, y + 1, width - 8, rowH - 2, focused, 6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,15 +246,36 @@ export class FileBrowserLayer implements Layer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
if (filesViewModeSetting.get() === "list") {
|
if (filesViewModeSetting.get() === "list") {
|
||||||
await this.handleListInput(event, ctx);
|
// The flat list has no spatial meaning for swipes; give them the
|
||||||
|
// standard scroll / select / back meanings (the layer opted into
|
||||||
|
// directional delivery for the icons view, so the stack won't).
|
||||||
|
await this.handleListInput(directionalFallback(event), ctx);
|
||||||
|
} else if (isWatchInput(event)) {
|
||||||
|
await this.handleIconsWatchInput(event, ctx);
|
||||||
} else {
|
} else {
|
||||||
await this.handleIconsInput(event, ctx);
|
await this.handleIconsInput(event, ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async handleListInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
/**
|
||||||
|
* Focus arriving from the watch goes straight to item selection, as in the
|
||||||
|
* launcher: the watch has left/right swipes, so it never needs row mode.
|
||||||
|
* Any other source keeps the two-level scheme and enters in row mode.
|
||||||
|
*/
|
||||||
|
onFocus(lastInput: InputEvent | null): void {
|
||||||
|
if (filesViewModeSetting.get() !== "icons") return;
|
||||||
|
if (lastInput && isWatchInput(lastInput)) {
|
||||||
|
this.iconMode = "item";
|
||||||
|
const iconRows = buildIconRows(this.flatRows());
|
||||||
|
this.clampColToRow(iconRows[clamp(this.selectedRow, 0, Math.max(0, iconRows.length - 1))]);
|
||||||
|
} else {
|
||||||
|
this.iconMode = "row";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleListInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
const rows = this.flatRows();
|
const rows = this.flatRows();
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
case "scroll-up":
|
case "scroll-up":
|
||||||
@@ -261,7 +297,7 @@ export class FileBrowserLayer implements Layer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async handleIconsInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
private async handleIconsInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
const rows = this.flatRows();
|
const rows = this.flatRows();
|
||||||
const iconRows = buildIconRows(rows);
|
const iconRows = buildIconRows(rows);
|
||||||
this.selectedRow = clamp(this.selectedRow, 0, Math.max(0, iconRows.length - 1));
|
this.selectedRow = clamp(this.selectedRow, 0, Math.max(0, iconRows.length - 1));
|
||||||
@@ -320,6 +356,88 @@ export class FileBrowserLayer implements Layer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The watch's scheme for the icons view — the launcher's: there is no row
|
||||||
|
* mode, the selection is always one cell (a special row counts as its
|
||||||
|
* single full-width item). Up/down (and the crown) move between rows
|
||||||
|
* keeping the column, right/left move within the row, and left from the
|
||||||
|
* leftmost column keeps going out — parent directory, Places, then the
|
||||||
|
* sidebar. Row mode is restored on the way out so a ring user finds the
|
||||||
|
* grid as they left it.
|
||||||
|
*/
|
||||||
|
private async handleIconsWatchInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
||||||
|
const iconRows = buildIconRows(this.flatRows());
|
||||||
|
this.selectedRow = clamp(this.selectedRow, 0, Math.max(0, iconRows.length - 1));
|
||||||
|
const row = iconRows[this.selectedRow];
|
||||||
|
if (this.iconMode === "row") {
|
||||||
|
this.iconMode = "item";
|
||||||
|
this.clampColToRow(row);
|
||||||
|
}
|
||||||
|
switch (event.type) {
|
||||||
|
case "swipe-up":
|
||||||
|
case "swipe-down":
|
||||||
|
case "scroll-up":
|
||||||
|
case "scroll-down": {
|
||||||
|
const delta = event.type === "swipe-down" || event.type === "scroll-down" ? 1 : -1;
|
||||||
|
this.selectedRow = clamp(this.selectedRow + delta, 0, Math.max(0, iconRows.length - 1));
|
||||||
|
// Keep the column; a shorter row (or a special one) clamps it.
|
||||||
|
this.clampColToRow(iconRows[this.selectedRow]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
case "swipe-right":
|
||||||
|
if (row?.kind === "grid") {
|
||||||
|
this.selectedCol = clamp(this.selectedCol + 1, 0, row.items.length - 1);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case "swipe-left":
|
||||||
|
if (row?.kind === "grid" && this.selectedCol > 0) {
|
||||||
|
this.selectedCol--;
|
||||||
|
} else {
|
||||||
|
this.watchNavigateUp();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case "click": {
|
||||||
|
if (!row) return;
|
||||||
|
if (row.kind === "special") {
|
||||||
|
await this.activateItem(row.item, ctx);
|
||||||
|
} else {
|
||||||
|
const item = row.items[clamp(this.selectedCol, 0, row.items.length - 1)];
|
||||||
|
if (item) await this.activateItem(item, ctx);
|
||||||
|
}
|
||||||
|
// Descending into a directory resets the selection for the ring (row
|
||||||
|
// mode at the top); the watch scheme stays in single-item selection.
|
||||||
|
this.iconMode = "item";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
case "double-click":
|
||||||
|
this.watchNavigateUp();
|
||||||
|
return;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private clampColToRow(row: IconRow | undefined): void {
|
||||||
|
if (row?.kind === "grid") {
|
||||||
|
this.selectedCol = clamp(this.selectedCol, 0, row.items.length - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* navigateUp for the watch scheme: inside the browser the selection stays
|
||||||
|
* in item mode (resetSelection/selectPath put it back in row mode for the
|
||||||
|
* ring); leaving from Places restores row mode on the way out.
|
||||||
|
*/
|
||||||
|
private watchNavigateUp(): void {
|
||||||
|
if (this.location === null) {
|
||||||
|
this.iconMode = "row";
|
||||||
|
this.options.onLeave();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.navigateUp();
|
||||||
|
this.iconMode = "item";
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* App-specific entries for the window long-press menu: the view switch,
|
* App-specific entries for the window long-press menu: the view switch,
|
||||||
* plus bookmark/unbookmark for the selected entry (in icons view only once
|
* plus bookmark/unbookmark for the selected entry (in icons view only once
|
||||||
|
|||||||
Loaded 100 of 316 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user