Streamlined code for clarity

Author: f0cii

base/containers.mojo

@@ -16,8 +16,14 @@ struct ObjectContainer[T: CollectionElement]:
         # print("ObjectContainer.__moveinit__")
         self.data = existing.data
         self.offset = existing.offset
+    
+    fn emplace(inout self, owned i: T) -> AnyPointer[T]:
+        (self.data + self.offset).emplace_value(i)
+        let ptr = (self.data + self.offset)
+        self.offset += 1
+        return ptr
 
-    fn emplace(inout self, owned i: T) -> Int:
+    fn emplace_as_index(inout self, owned i: T) -> Int:
         (self.data + self.offset).emplace_value(i)
         let index = (self.data + self.offset).__as_index()
         self.offset += 1

base/fixed.mojo

@@ -18,12 +18,12 @@ fn seq_fixed12_to_string(fixed: Int64, result: c_void_pointer) -> c_size_t:
     )
 
 
-# 自定义*
+# Customize multiplication operation
 fn seq_fixed_mul(a: Int64, b: Int64) -> Int64:
     return external_call["seq_fixed_mul", Int64, Int64, Int64](a, b)
 
 
-# 自定义/
+# Customize division operation
 fn seq_fixed_truediv(a: Int64, b: Int64) -> Int64:
     return external_call["seq_fixed_truediv", Int64, Int64, Int64](a, b)
 
@@ -115,6 +115,10 @@ struct Fixed(Stringable):
             _value: v,
         }
 
+    fn abs(self) -> Self:
+        let v = -self._value if self._value < 0 else self._value
+        return Self {_value: v}
+
     fn __eq__(self, other: Self) -> Bool:
         return self._value == other._value
 
@@ -133,37 +137,41 @@ struct Fixed(Stringable):
     fn __ge__(self, other: Self) -> Bool:
         return self._value >= other._value
 
-    # 自定义+
+    # Customizing negation
+    def __neg__(self) -> Self:
+        return Self {_value: -self._value}
+
+    # Customizing addition
     fn __add__(self, other: Self) -> Self:
         return Self {_value: self._value + other._value}
 
-    # 自定义+=
+    # Customizing +=
     fn __iadd__(inout self, other: Self):
         self._value += other._value
 
-    # 自定义-
+    # Customizing subtraction
     fn __sub__(self, other: Self) -> Self:
         return Self {_value: self._value - other._value}
 
-    # 自定义-=
+    # Customizing -=
     fn __isub__(inout self, other: Self):
         self._value -= other._value
 
-    # 自定义*
+    # Customizing multiplication
     fn __mul__(self, other: Self) -> Self:
         let v = seq_fixed_mul(self._value, other._value)
         return Self {_value: v}
 
-    # 自定义*=
+    # Customizing *=
     fn __imul__(inout self, other: Self):
         self._value = seq_fixed_mul(self._value, other._value)
 
-    # 自定义/
+    # Customizing division
     fn __truediv__(self, other: Self) -> Self:
         let v = seq_fixed_truediv(self._value, other._value)
         return Self {_value: v}
 
-    # 自定义/=
+    # Customizing /=
     fn __itruediv__(inout self, other: Self):
         self._value = seq_fixed_truediv(self._value, other._value)
 

base/globals.mojo

@@ -1,7 +1,7 @@
 from base.mo import seq_set_global_int, seq_get_global_int
 
 
-# 定义全局指针的存储Key
+# Define the storage key for global pointers
 alias GLOBAL_INT_KEY_START = 10000
 alias TRADE_EXECUTOR_PTR_KEY = GLOBAL_INT_KEY_START + 1
 alias WS_ON_CONNECT_WRAPPER_PTR_KEY = GLOBAL_INT_KEY_START + 2
@@ -13,13 +13,13 @@ alias GLOBAL_STRING_KEY_START = 10000
 alias CURRENT_STRATEGY_KEY = GLOBAL_STRING_KEY_START + 1
 
 
-# 设置全局指针
+# Set global pointer
 @always_inline
 fn set_global_pointer(key: Int, pointer: Int):
     seq_set_global_int(key, pointer)
 
 
-# 获取全局指针
+# Get global pointer
 @always_inline
 fn get_global_pointer(key: Int) -> Int:
     return seq_get_global_int(key)

base/mo.mojo

@@ -19,24 +19,24 @@ fn seq_int_to_voidptr(i: Int) -> c_void_pointer:
     return external_call["seq_int_to_voidptr", c_void_pointer, Int](i)
 
 
-# 存储全局Int值
+# Store global integer value
 fn seq_set_global_int(id: Int, i: Int) -> None:
     external_call["seq_set_global_int", NoneType, Int, Int](id, i)
 
 
-# 读取全局Int值
+# Retrieve global integer value
 fn seq_get_global_int(id: Int) -> Int:
     return external_call["seq_get_global_int", Int, Int](id)
 
 
-# 存储全局String值
+# Store global string value
 fn seq_set_global_string(id: Int, s: String) -> None:
     external_call["seq_set_global_string", NoneType, Int, c_char_pointer, c_size_t](
         id, s._buffer.data.value, len(s)
     )
 
 
-# 读取全局String值
+# Retrieve global string value
 fn seq_get_global_string(id: Int) -> String:
     var s_len: c_size_t = 0
     let s = external_call[
@@ -106,7 +106,7 @@ fn init_log(level: String, filename: String) -> None:
     seq_init_log(level_, filename)
 
 
-# 初始化日志
+# Initialization log
 fn seq_init_log(level: UInt8, filename: String) -> None:
     external_call["seq_init_log", NoneType, UInt8, Pointer[c_schar], c_int](
         level, filename._buffer.data.value, len(filename)

base/moutil.mojo

@@ -56,10 +56,9 @@ def str_to_bool(s: String) -> Bool:
 
 fn decimal_places(value: Float64) -> Int:
     """
-    返回小数位: 0.0001 -> 4
+    Return decimal places: 0.0001 -> 4
     """
     if value == 0.0:
         return 0
 
-    # 取整位数即decimal places
     return int(math.ceil(math.log10(1.0 / value)))

base/sj_dom.mojo

@@ -777,14 +777,14 @@ struct DomParser:
     fn parse(self, s: String) raises -> DomElement:
         let p = seq_simdjson_dom_parser_parse(self.p, s._buffer.data.value, len(s))
         if not seq_simdjson_dom_element_is_valid(p):
-            raise Error("解析json出错: [" + s + "]")
+            raise Error("JSON parsing error: [" + s + "]")
         return DomElement(p)
 
     @always_inline
     fn parse(self, data: Pointer[c_schar], data_len: Int) raises -> DomElement:
         let p = seq_simdjson_dom_parser_parse(self.p, data, data_len)
         if not seq_simdjson_dom_element_is_valid(p):
-            raise Error("解析json出错: [" + c_str_to_string(data, data_len) + "]")
+            raise Error("JSON parsing error: [" + c_str_to_string(data, data_len) + "]")
         return DomElement(p)
 
     fn __repr__(self) -> String:

base/str.mojo

@@ -2,22 +2,6 @@ from .list_iterator import ListIterator
 from memory import memcpy
 
 
-# @value
-# @register_passable("trivial")
-# struct Str2:
-#     var data: DynamicVector[Int8]
-
-#     fn __init__(value: StringLiteral) -> Str2:
-#         let l = len(value)
-#         let s = String(value)
-#         let p = Pointer[Int8].alloc(l)
-
-#         for i in range(l):
-#             p.store(i, s._buffer[i])
-
-#         return Str(p, l)
-
-
 @value
 @register_passable
 struct Str(Stringable):
@@ -83,13 +67,5 @@ struct Str(Stringable):
         memcpy(ptr, self.data, self.size)
         return String(ptr, self.size + 1)
 
-    # fn to_string_ref(self) -> StringRef:
-    #     # 返回的StringRef，需要自己释放内存，否则有泄漏问题
-    #     let ptr = Pointer[Int8]().alloc(self.size)
-    #     memcpy(ptr, self.data, self.size)
-    #     return StringRef(
-    #         ptr.bitcast[__mlir_type.`!pop.scalar<si8>`]().address, self.size
-    #     )
-
     fn __str__(self) -> String:
         return self.to_string()

base/thread.mojo

@@ -347,24 +347,24 @@ struct iovec:
         return (ptr, self.iov_len)
 
 
-# 创建队列
+# Create queue
 fn seq_lockfree_queue_new() -> c_void_pointer:
     return external_call["seq_lockfree_queue_new", c_void_pointer]()
 
 
-# 销毁队列
+# Destroy queue
 fn seq_lockfree_queue_free(q: c_void_pointer) -> None:
     external_call["seq_lockfree_queue_free", NoneType, c_void_pointer](q)
 
 
-# 入队操作
+# Enqueue operation
 fn seq_lockfree_queue_push(q: c_void_pointer, data: Pointer[iovec]) -> Bool:
     return external_call[
         "seq_lockfree_queue_push", Bool, c_void_pointer, Pointer[iovec]
     ](q, data)
 
 
-# 出队操作
+# Dequeue operation
 fn seq_lockfree_queue_pop(q: c_void_pointer, data: Pointer[iovec]) -> Bool:
     return external_call[
         "seq_lockfree_queue_pop", Bool, c_void_pointer, Pointer[iovec]

build.sh

@@ -1,39 +1,39 @@
 #!/bin/bash
 
-# 定义默认输出文件名变量
+# Define the default output filename variable
 output="" 
 
-# 解析输入参数
+# Parse input arguments
 while [[ $# -gt 0 ]]; do
   case $1 in
     -o)
-      # 获取输出文件名参数
+      # Get the output filename argument
       output="$2"
       shift 2
       ;;
     *)
-      # 获取输入mojo文件名
+      # Get the input mojo filename
       input="$1" 
       shift
       ;;
   esac
 done
 
-# 如果没有指定输出文件名,默认设置为输入文件名
+# If no output filename is specified, set it to the input filename by default
 if [ -z "$output" ]; then
   output="${input%.*}"
 fi
 
-# 构造mojoc命令
+# Construct mojoc command
 cmd="./scripts/mojoc $input -lmoxt -L . -o $output"
 
-# 打印将要执行的命令
+# Print the command to be executed
 echo "Executing command: $cmd"
 
-# 执行命令 
+# Execute the command 
 $cmd
 
-# 检查返回状态
+# Check return status
 if [ $? -eq 0 ]; then
   echo "Command executed successfully"
 else

config.example.toml

@@ -11,7 +11,7 @@ name = "SmartGridStrategy"
 [params]
 grid_interval = 0.01
 order_qty = 0.001
-# 设置总体止损百分比
+# Set overall stop-loss percentage
 total_sl_percent = -0.1
-# 设置单个格子止损百分比
+# Set individual grid stop-loss percentage
 cell_sl_percent = -0.05